Merge branch 'jh/dirstat-lines'