Merge branch 'xdg-init'