Merge pull request #4583 from fritsch/xbmc-upstream