Merge pull request #1496 from rouault/fix_1480