sync with upstream 36eba34
rebranding. xbmc -> kodi