Merge branch 'pt/xdg-config-path' into maint