Merge branch 'jh/diff-index-line-abbrev' into next