Fixes the countries list for sites with geometric context
Merge branch 'master' into staging