Merge remote-tracking branch 'origin/rel_2_7_mergery' into HEAD
authorDan Scott <dscott@laurentian.ca>
Tue, 17 Nov 2015 17:13:46 +0000 (12:13 -0500)
committerDan Scott <dscott@laurentian.ca>
Tue, 17 Nov 2015 17:13:46 +0000 (12:13 -0500)

Trivial merge