Merge branch 'vlc_compat'