Fixed merge issue with mute fix from xbmc master