Feature/benchmarks/master

I'm not crazy about this threadlocal thing. I know we can do without it. For the time being I won't make a fuss about it, but I don't like it.