Merge remote-tracking branch 'conifer/rel_2_7_mergery' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Fri, 16 Jan 2015 20:21:33 +0000 (15:21 -0500)
committerDan Scott <dscott@laurentian.ca>
Fri, 16 Jan 2015 20:21:33 +0000 (15:21 -0500)

Trivial merge