Merge pull request #2820 from Fice/dnd_favourites_dir