Merge commit 'refs/changes/09/809/1' of https://review.webmproject.org/p/libvpx