Merge branch 'master' into work
show near_station only when it exists
Merge branch 'work'