VS2010 again :(
Merge remote-tracking branch 'origin/master' into vulk