Merge remote-tracking branch 'remotes/conifer/features/2.4-to-2.7' into mergery_2_7
authorDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:21:35 +0000 (07:21 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:21:35 +0000 (07:21 -0500)

Trivial merge