Inflecting cities' names
Merge branch 'master' into ptics_time_fixes