temporarily fixes #811 plus 16 others
Merge branch 'develop' of https://github.com/DennisOSRM/Project-OSRM into develop