Merge pull request #1974 from alanbuxey/patch-3