Merge pull request #6188 from JKingsnorth/patch-1