Merge pull request #4664 from kieranoreilly/patch-1