Merge branch 'dw/diff-highlight-makefile-fix' into maint