Conflicts: oscar/apps/partner/strategy.py oscar/core/compat.py oscar/templatetags/stockrecord_tags.py tests/integration/partner/strategy_tests.py