Django users do not have to specify DJANGO_SETTINGS_MODULE
Merge branch '3.1'

Conflicts:
	docs/django/first-steps-with-django.rst