Merge pull request #6117 from Kagee/patch-1