Fix build
Merge branch 'master' into mapdata-c++