Merge pull request #6120 from nawl/master