[kodi/f29] (2 commits) ...Update to 18.0 RC2