Merge branch 'mm/config-local-completion'