[kodi/f32] (2 commits) ...Update to 18.6