Merge pull request #1773 from skob/master