Sync with videolan master