Renames XBMC to Kodi and resolves 406.
Merge remote-tracking branch 'origin/master'