Merge branch 'jc/numstat'