Merge branch 'feature/tpac_conifer_2_7' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Sat, 17 Jan 2015 15:45:32 +0000 (10:45 -0500)
committerDan Scott <dscott@laurentian.ca>
Sat, 17 Jan 2015 15:45:32 +0000 (10:45 -0500)

Trivial merge