Merged after 0.6.2 Conflicts: docs/source/releases/index.rst oscar/__init__.py oscar/templates/oscar/customer/wishlists/wishlists_detail.html oscar/test/testcases.py tests/functional/dashboard/order_tests.py