compiles properly with VS2010
Merge branch 'v2.1'