Merge pull request #1232 from rouault/fix_1231