Merge pull request #1460 from rouault/fix_1459