merge graphhopper/master
merge graphhopper/master