compiles with VS2010 on first build
Merge branch 'v2.1'