Merge branch 'wheres_this' of https://github.com/pnorman/openstreetmap-website into...