Travis must only test the master branch
Merge branch 'master' into django1.7