Merge branch 'master' into bug-920270-basket-api

Conflicts:
	mozillians/users/models.py
	vendor-local/src/basket-client