patch to build on vs2010
Revert "patch to build on vs2010"

This reverts commit 2da480bef0109f815425e294416a564bf44921db.
cleanup
Merge remote-tracking branch 'origin/master' into vs2010