Merge branch 'master' of https://github.com/tangentlabs/django-oscar into feature/demo-multipayment-with-faceted-catalogue
Merge branch 'feature/demo-multipayment-with-faceted-catalogue' of https://github.com/okfish/django-oscar into feature/demo-multipayment-with-faceted-catalogue