Merge pull request #1448 from rouault/fix_1447