diff --git a/README.chromium b/README.chromium
index cb7a1e694..dda2eaa01 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 489
+Version: 490
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 9ca848155..5b3055692 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 489
+#define LIBYUV_VERSION 490
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/scale.cc b/source/scale.cc
index 7a94e0931..298051467 100644
--- a/source/scale.cc
+++ b/source/scale.cc
@@ -3115,6 +3115,9 @@ void ScalePlaneBilinear(int src_width, int src_height,
     int x = (dx >= 65536) ? ((dx >> 1) - 32768) : (dx >> 1);
     int y = (dy >= 65536) ? ((dy >> 1) - 32768) : (dy >> 1);
     int maxy = (src_height > 1) ? ((src_height - 1) << 16) - 1 : 0;
+    if (y > maxy) {
+      y = maxy;
+    }
     for (int j = 0; j < dst_height; ++j) {
       int yi = y >> 16;
       int yf = (y >> 8) & 255;
diff --git a/unit_test/compare_test.cc b/unit_test/compare_test.cc
index 88007e28e..e74c92d7c 100644
--- a/unit_test/compare_test.cc
+++ b/unit_test/compare_test.cc
@@ -30,7 +30,7 @@ static uint32 ReferenceHashDjb2(const uint8* src, uint64 count, uint32 seed) {
   return hash;
 }
 
-TEST_F(libyuvTest, BenchmakDjb2_OPT) {
+TEST_F(libyuvTest, BenchmakDjb2_Opt) {
   const int kMaxTest = benchmark_width_ * benchmark_height_;
   align_buffer_64(src_a, kMaxTest)
 
@@ -46,7 +46,7 @@ TEST_F(libyuvTest, BenchmakDjb2_OPT) {
   free_aligned_buffer_64(src_a)
 }
 
-TEST_F(libyuvTest, BenchmakDjb2_Unaligned_OPT) {
+TEST_F(libyuvTest, BenchmakDjb2_Unaligned) {
   const int kMaxTest = benchmark_width_ * benchmark_height_;
   align_buffer_64(src_a, kMaxTest + 1)
   for (int i = 0; i < kMaxTest; ++i) {
@@ -61,7 +61,7 @@ TEST_F(libyuvTest, BenchmakDjb2_Unaligned_OPT) {
   free_aligned_buffer_64(src_a)
 }
 
-TEST_F(libyuvTest, BenchmarkSumSquareError_OPT) {
+TEST_F(libyuvTest, BenchmarkSumSquareError_Opt) {
   const int kMaxWidth = 4096 * 3;
   align_buffer_64(src_a, kMaxWidth)
   align_buffer_64(src_b, kMaxWidth)
@@ -134,7 +134,7 @@ TEST_F(libyuvTest, SumSquareError) {
   free_aligned_buffer_64(src_b)
 }
 
-TEST_F(libyuvTest, BenchmarkPsnr_OPT) {
+TEST_F(libyuvTest, BenchmarkPsnr_Opt) {
   align_buffer_64(src_a, benchmark_width_ * benchmark_height_)
   align_buffer_64(src_b, benchmark_width_ * benchmark_height_)
   for (int i = 0; i < benchmark_width_ * benchmark_height_; ++i) {
@@ -151,7 +151,7 @@ TEST_F(libyuvTest, BenchmarkPsnr_OPT) {
                   benchmark_width_, benchmark_height_);
 
   opt_time = (get_time() - opt_time) / benchmark_iterations_;
-  printf("BenchmarkPsnr_OPT - %8.2f us opt\n", opt_time * 1e6);
+  printf("BenchmarkPsnr_Opt - %8.2f us opt\n", opt_time * 1e6);
 
   EXPECT_EQ(0, 0);
 
@@ -236,7 +236,7 @@ TEST_F(libyuvTest, Psnr) {
   free_aligned_buffer_64(src_b)
 }
 
-TEST_F(libyuvTest, BenchmarkSsim_OPT) {
+TEST_F(libyuvTest, BenchmarkSsim_Opt) {
   align_buffer_64(src_a, benchmark_width_ * benchmark_height_)
   align_buffer_64(src_b, benchmark_width_ * benchmark_height_)
   for (int i = 0; i < benchmark_width_ * benchmark_height_; ++i) {
@@ -253,7 +253,7 @@ TEST_F(libyuvTest, BenchmarkSsim_OPT) {
                   benchmark_width_, benchmark_height_);
 
   opt_time = (get_time() - opt_time) / benchmark_iterations_;
-  printf("BenchmarkSsim_OPT - %8.2f us opt\n", opt_time * 1e6);
+  printf("BenchmarkSsim_Opt - %8.2f us opt\n", opt_time * 1e6);
 
   EXPECT_EQ(0, 0);  // Pass if we get this far.