Sync with mapgen 58f7883