update from appveyor2 branch