Merge remote-tracking branch 'conifer/feature/tpac_nosm_2_7' into HEAD
authorDan Scott <dscott@laurentian.ca>
Fri, 4 Sep 2015 15:48:43 +0000 (11:48 -0400)
committerDan Scott <dscott@laurentian.ca>
Fri, 4 Sep 2015 15:48:43 +0000 (11:48 -0400)

Trivial merge