[media-sound/tomahawk] Sync with tree