Update to use 1.5 AUTH_USER_MODEL setting
Merge commit '923cc111205978c51194abd79a6d712e302e3aa2'