Commit 610cff13a31964eeb2264a452424e1e3d49accc3

Edward Thomson 2016-10-09T16:05:48

Merge branch 'pr/3809'