Merge branch 'jc/log-stdin'