Merge pull request #1369 from DynamicDevices/ajl/appveyor