Update mkgmap to version r2654
Update osmconvert to version 0.7T