If the country only has one postal code, then use a lookup table and don't prompt the user.
Merge remote-tracking branch 'origin/API-20140530' into API-20140530