Merge pull request #1200 from Wedmer/master