Fix static list of public servers.
Merge branch 'master' into production