Merge pull request #5026 from JohnFF/patch-8