Merge "Make ConsoleReaderOutputStream deal correctly with synchronous tasks"