Merge remote-tracking branch 'conifer/rel_2_7_mergery' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Sat, 17 Jan 2015 15:35:29 +0000 (10:35 -0500)
committerDan Scott <dscott@laurentian.ca>
Sat, 17 Jan 2015 15:35:29 +0000 (10:35 -0500)

Trivial merge