Merge pull request #1101 from fbenkstein/vs2010