[kodi: 3/3] Merge branch 'f24'