Merge pull request #1431 from rouault/fix_1430