Merge branch 'feature/tpac_osul_2_7' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Wed, 23 Dec 2015 16:01:59 +0000 (11:01 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 23 Dec 2015 16:01:59 +0000 (11:01 -0500)

Trivial merge