Merge pull request #6434 from JoeMurray/patch-4