Can't rebuild wrapper on Win, so I'm checking it in...