Merge branch 'mirror' into vdpau