Merge pull request #1655 from ghuntley/patch-1