Merge remote-tracking branch 'remotes/conifer/feature/tpac_osul_2_7' into rel_2_7_mer...
authorDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 21:03:29 +0000 (16:03 -0500)
committerDan Scott <dscott@laurentian.ca>
Wed, 17 Dec 2014 21:03:29 +0000 (16:03 -0500)

Trivial merge