Merge branch 'jc/diff-numstat'