Merge branch 'rel_2_7_mergery' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Wed, 15 Apr 2015 16:15:32 +0000 (12:15 -0400)
committerDan Scott <dscott@laurentian.ca>
Wed, 15 Apr 2015 16:15:32 +0000 (12:15 -0400)

Trivial merge