Following release of 0.6.4. Conflicts: docs/source/releases/index.rst oscar/__init__.py oscar/apps/customer/forms.py oscar/apps/dashboard/partners/forms.py oscar/core/compat.py tests/integration/customer/test_custom_user_model.py