VC++ compilation fixes.
Merge remote-tracking branch 'origin/master' into wx