Merge remote-tracking branch 'conifer/feature/tpac_nosm_2_7' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Wed, 10 Dec 2014 14:10:14 +0000 (09:10 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 10 Dec 2014 14:10:14 +0000 (09:10 -0500)

Trivial merge