Merge branch 'master' of https://github.com/potatolondon/django-nonrel-1-4
Fixed #17966 -- Isolated ProfileTestCase from custom AUTH_PROFILE_MODULE

Thanks Rob Golding for helping on the patch.

Conflicts:
	django/contrib/auth/tests/models.py