Updated XBMC to xbmc/xbmc@aae7f2d8ce