Merge branch 'jc/refactor-diff-stdin'