Update requires.txt
Merge branch 'master' into django1.4