Merge branch 'feature/circ_scripts_2_7' into rel_2_7_mergery
authorDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 21:36:26 +0000 (16:36 -0500)
committerDan Scott <dscott@laurentian.ca>
Sun, 7 Dec 2014 21:36:26 +0000 (16:36 -0500)

Trivial merge