Merge -r 20198:20540 from trunc into openstreetbugs branch