django-oscar v1.0 compatibility around shipping
Merge branch 'master' into pr/3

Conflicts:
	setup.py