Merge branch 'jh/dirstat' into maint