Merge pull request #1123 from Wedmer/master