Fixed: mapdata-c++ > master branch merge errors