Conflicts: docs/source/releases/v0.7.rst oscar/apps/basket/abstract_models.py oscar/apps/customer/abstract_models.py oscar/core/compat.py sites/demo/settings.py