Merge pull request #2580 from ericpardee/patch-1