[mkgmap-dev] Preparing merge with trunk for branch NET-no-NOD