Merge branch 'rel_2_7_mergery' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Sun, 11 Jan 2015 02:37:09 +0000 (21:37 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 11 Jan 2015 02:37:09 +0000 (21:37 -0500)

Trivial merge