Merge pull request #7606 from JKingsnorth/patch-5