Merge pull request #3296 from Wedmer/master