Merge pull request #1919 from bosmacs/master