Merge "add support for displaying log files on standard input"