Merge branch 'jc/diffstat'