Merge pull request #2346 from jmcclelland/county-field-should-populate-with-counties