Merge pull request #1276 from rouault/fix_1243