Merge pull request #915 from rouault/appveyor_fix_attempt