Line-end changes
Merge changes from upstream
Create new appveyor build script