Merge branch 'master' into vc++-fixes