sync with xbmc@xbmc 145c2a5d1