Merge pull request #1419 from rouault/fix_ci