Merge pull request #1601 from tpikonen/desktopfile-dirs