Merge branch 'dk/maint-blame-el' into maint