Merge pull request #4587 from fritsch/xbmc-upstream