Merge pull request #1433 from rouault/fix_1432