Minor fixes.
Minor fixes.

Merge branch 'issue/675/per_variant_image_support' into issue/675/merge_master_fix

sonofatailor/django-oscar,sonofatailor/django-oscar,sonofatailor/django-oscar,sonofatailor/django-oscar