Manual merge of xbmc changes.