Merge pull request #8434 from totten/master-regen-zipcodes