Merge branch 'zj/mksh-columns-breakage' into lp/diffstat-with-graph