Merge branch 'mm/config-xdg'