Merge pull request #1463 from rouault/fix_570