Ported changes to requirements.txt from master branch