[mkgmap-dev] Commit: r817: Merge latest trunk into the nod branch.