Merge pull request #1229 from rouault/fix_1228