Updated XBMC to xbmc/xbmc@a836b6aaa8