Commit 8d3b39a6ad325fe1d08e17281803e26359756fc6

Edward Thomson 2017-01-21T23:50:38

Merge branch 'pr/3912'