A requirements.pip file will now be used if present
Merging from master