Merge pull request #1511 from rouault/fix_1488_bis