[xbmc-main] sync with master, rebrand to Kodi step 2