Conflicts:
	tests/apps/tests.py
	tests/migrations/test_graph.py
	tests/queryset_pickle/tests.py
	tests/runtests.py

Backport of 1c5f4e86 from master