Merge branch 'mk/diff-shortstat-dirstat-fix' into maint