Merge pull request #1953 from brpocock/master