Conflicts: oscar/__init__.py oscar/apps/basket/abstract_models.py oscar/apps/checkout/views.py tests/functional/basket_tests.py