Merge pull request #1510 from rouault/fix_1505