Merge remote-tracking branch 'remotes/conifer/feature/fts-polish-l_2_7' into mergery_2_7
authorDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:23:17 +0000 (07:23 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 12:23:17 +0000 (07:23 -0500)

Trivial merge