Merge pull request #1292 from rouault/fix_1286