Merge branch 'feature/move_to_storage_2_7' into rel_2_7_mergery
authorDan Scott <dscott@laurentian.ca>
Wed, 15 Apr 2015 16:50:31 +0000 (12:50 -0400)
committerDan Scott <dscott@laurentian.ca>
Wed, 15 Apr 2015 16:50:31 +0000 (12:50 -0400)

Trivial merge