Merge branch 'feature/tpac_huntington_2_7' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Wed, 10 Dec 2014 20:33:31 +0000 (15:33 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 10 Dec 2014 20:33:31 +0000 (15:33 -0500)

Trivial merge