Commit d07c9f4d2a59dbd423c155b0e74fdeb3c88ea4b9

Edward Thomson 2015-11-02T16:36:28

Merge branch 'pr/3147'