Merge branch 'master' of git://git.openstreetmap.org/rails