Commit 5c99cf93d6242803bddcac2ca8300fdec7e0f8a7

ThePhD 2015-08-14T01:02:00

Merge branch 'master' into vc++-fixes