Merge branch 'master' of github.com:dokterbob/django-shopkit into visualspace_master
Merge branch 'master' into visualspace_master
PositiveSmallInteger causes overflow at 65535 for sort_order fields.
Make sure cache is not used for order state change
Merge remote branch 'origin/sport81' into cosmania
Merge remote branch 'cosmania/cosmania'