Merge branch 'master' into prefer-webm