Merge pull request #1853 from alanbuxey/patch-4