Merge branch 'tpac_conifer_2_7' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Tue, 9 Dec 2014 20:52:41 +0000 (15:52 -0500)
committerDan Scott <dscott@laurentian.ca>
Tue, 9 Dec 2014 20:52:41 +0000 (15:52 -0500)

Trivial merge