Works around a problem in glib where two on-disk directories could have different filenames that collated to the same collation key; fixes #6825.
Merge branch 'master' of git://yorba.org/shotwell