Merge branch '817-ambiguous_weather_options' into 'master'

Show country in weather locations

See merge request !90
1 job for master in 4 minutes and 10 seconds (queued for 9 seconds)