Merge git://github.com/cpesch/RouteConverter