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