Merge pull request #1912 from dumganhar/master

Updating build-win32.bat.
Updating vs2012 solution.
Merge remote-tracking branch 'origin/master'