Merge branch 'appveyor'