Better fix for 'pip' detection in setup.py
Merge pull request #4178 from zsimic/develop

Better fix for 'pip' detection in setup.py