Fix std::cout
Merge branch 'master' into trylock