Merge remote-tracking branch 'openstreetmap/pull/1312'