sync with upstream 1832e60
sync with upstream 79ca634
rebranding. xbmc -> kodi