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