sync with xbmc@xbmc 14b5c2a5d1