merge xdg-base-dir to master