[mkgmap-dev] Commit r3997: merge from branch expr which fixes errors in the style file reader