Merge remote-tracking branch 'openstreetmap/pull/1347' into master