Merge pull request #1442 from dpocock/master