[mkgmap-dev] Commit: r1513: Apply the term rearrangement patch that was reverted from