[mkgmap-dev] Commit r3730: Merge file-encoding branch