Conflicts: docs/source/releases/v0.6.rst oscar/apps/order/processing.py oscar/templates/oscar/dashboard/orders/line_detail.html oscar/templates/oscar/dashboard/orders/order_detail.html