Merge pull request #1094 from pradyunsg/patch-1

Adapt for changes in next pip release