Merge pull request #965 from evoskuil/master

Update VS build configurations.