Merge pull request #1644 from reverendhomer/patch-1