Merge pull request #1051 from graingert/patch-1