Merge remote-tracking branch 'webm/master' into nextgenv2