[kodi] (3 commits) ...Merge branch 'f24'