Merge git://staff.get-e.org/users/andrunko/lightmediascanner