Commit 9e78b7279de4bcf22a354c02ae25a6a0849dbb7d

Edward Thomson 2017-01-21T22:39:59

Merge branch 'master' into pr/3938