Don't mix requirements.txt and test-requirements.txt
Merge remote-tracking branch 'origin/master'