Merge pull request #3366 from Wedmer/master