6231e3a778
Merge commit 'ef1f21b34f5624adb7436d3da927660ed16c97c7' * commit 'ef1f21b34f5624adb7436d3da927660ed16c97c7': Don't trim() in the mediascanner, as that would remove the special "sort first" character.