Merge branch 'master' into feature/configurable-order-totals
Moved discount code updating before session clearing, as discount_code may be session field.
Merge branch 'feature/configurable-order-totals' into develop