Merge pull request #1961 from alanbuxey/patch-8