Merge commit 'refs/changes/51/351/1' of ssh://review.webmproject.org:29418/libvpx...