Sync with XBMC repo