Merge pull request #1410 from rouault/fix_1404