Merge branch 'maint-1.7.4' into maint * maint-1.7.4: completion: replace core.abbrevguard to core.abbrev