Merge change 6231 into donut

* changes:
  Don't trim() in the mediascanner, as that would remove the special "sort first" character.