Merge branch 'feature/tpac_uhearst_2_7' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Wed, 10 Dec 2014 17:34:08 +0000 (12:34 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 10 Dec 2014 17:34:08 +0000 (12:34 -0500)

Trivial merge