Merge remote-tracking branch 'anarcat/osm-fixes'