Commit 610e553f5b43b4741b5c74d77cc1e07c88749bfc

Edward Thomson 2015-11-03T17:52:21

Merge branch 'pr/3487'