Convert NS country names to iso on shipments
Merge branch 'master' into cassetes