[kodi/f30] (3 commits) ...Update to 18.5