Merge pull request #2962 from simonwjackson/patch-1