Code

Merge branch 'jc/diffstat' into next