[kodi/f31] (5 commits) ...Update to 18.6