Commit 52949c806b43ce1fec283c2a9627aa0688f8aa9e

Edward Thomson 2017-01-21T18:30:12

Merge branch 'pr/4060'