[kodi/f24] (2 commits) ...Merge branch 'f24'