Merge branch 'master' into user-profiles-clean

Conflicts:
	apps/users/views.py
	kuma/users/templates/users/profile_edit.html
	kuma/users/tests/test_views.py