Improved shipping zone configuration ergonomy
Merge branch 'master' into shipping-zones-fix
Tests fixed
CS fix
Merge pull request #668 from roadster31/shipping-zones-fix

Improved shipping zone configuration ergonomy