Merge branch 'drop-django-16' oft https://github.com/carltongibson/django-rest-framework into carltongibson-drop-django-16

Conflicts:
	docs/topics/release-notes.md