Merge remote-tracking branch 'rbultje/vp9-bugfixes'