Merge branch 'mm/config-pathname-tilde-expand' into maint