Conflicts: src/oscar/templates/oscar/dashboard/catalogue/product_class_form.html This commit closes #1550.