Pull changes from xbmc:master