Revert "Catch should not hijack std::cout"

This reverts commit facb940e00bb14da6416c1255cac8efc4339686d.

Catch was not hijacking it. Ninja was.
Merge branch 'devel' into stable