sync with xbmc@xbmc 66b121527f