Merge pull request #5495 from Wedmer/master