Merge remote-tracking branch 'apmon/openstreetbugs2' into openstreetbugs