Merge branch 'admin_image_errors' into 1-3-stable
Merge branch 'execute_transition_callbacks' into 1-3-stable
Merge branch 'normalize_promo_codes' into 1-3-stable
Merge branch 'sane_skus' into 1-3-stable
Merge branch 'show_promo_errors' into 1-3-stable