Merge branch 'lp/diffstat-with-graph'