Merge remote-tracking branch 'rbrito/prefer-webm'