Merge pull request #1281 from alanbuxey/patch-11