Refactor gazetteer into its own repo
Merge remote-tracking branch 'origin/master'