Merge pull request #13661 from codingCoffee/pip10

Compatibility for pip 10