Merge pull request #1650 from alanbuxey/patch-6