Merge pull request #1580 from auouymous/fix-appveyor-build