[mkgmap-dev] if-then branch ready for merge to trunk?