Merge pull request #4163 from stintel/kodi