Backporting the changes for 0.7.3. Conflicts: docs/source/releases/index.rst oscar/__init__.py setup.py