Merge branch 'feature/tpac_osul_2_7' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 21:39:38 +0000 (16:39 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 21:39:38 +0000 (16:39 -0500)

Trivial merge