Merge pull request #1401 from rouault/fix_1399