Merge upstream. Add Django 1.6 to test runner.