diff --git a/README.chromium b/README.chromium
index 3de0df132..192264554 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1670
+Version: 1671
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index f27ccfbb0..6d614557a 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1670
+#define LIBYUV_VERSION 1671
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_
diff --git a/source/cpu_id.cc b/source/cpu_id.cc
index 12e03345b..d9bb9ec3b 100644
--- a/source/cpu_id.cc
+++ b/source/cpu_id.cc
@@ -124,7 +124,7 @@ void CpuId(int eax, int ecx, int* cpu_info) {
 int GetXCR0() {
   int xcr0 = 0;
 #if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 160040219)
-  xcr0 = (int) _xgetbv(0);  // VS2010 SP1 required.  NOLINT
+  xcr0 = (int)_xgetbv(0);  // VS2010 SP1 required.  NOLINT
 #elif defined(__i386__) || defined(__x86_64__)
   asm(".byte 0x0f, 0x01, 0xd0" : "=a"(xcr0) : "c"(0) : "%edx");
 #endif  // defined(__i386__) || defined(__x86_64__)
diff --git a/source/row_neon64.cc b/source/row_neon64.cc
index de17f8b73..341e14553 100644
--- a/source/row_neon64.cc
+++ b/source/row_neon64.cc
@@ -2646,11 +2646,11 @@ float ScaleMaxSamples_NEON(const float* src,
       "b.gt       1b                             \n"
       "fmax       v5.4s, v5.4s, v6.4s            \n"  // max
       "fmaxv      %s3, v5.4s                     \n"  // signed max acculator
-      : "+r"(src),    // %0
-        "+r"(dst),    // %1
-        "+r"(width),  // %2
-        "=w"(fmax)    // %3
-      : "w"(scale)    // %4
+      : "+r"(src),                                    // %0
+        "+r"(dst),                                    // %1
+        "+r"(width),                                  // %2
+        "=w"(fmax)                                    // %3
+      : "w"(scale)                                    // %4
       : "cc", "memory", "v1", "v2", "v3", "v4", "v5", "v6");
   return fmax;
 }
@@ -2676,11 +2676,11 @@ float ScaleSumSamples_NEON(const float* src,
       "faddp      v5.4s, v5.4s, v6.4s            \n"
       "faddp      v5.4s, v5.4s, v5.4s            \n"
       "faddp      %3.4s, v5.4s, v5.4s            \n"  // sum
-      : "+r"(src),    // %0
-        "+r"(dst),    // %1
-        "+r"(width),  // %2
-        "=w"(fsum)    // %3
-      : "w"(scale)    // %4
+      : "+r"(src),                                    // %0
+        "+r"(dst),                                    // %1
+        "+r"(width),                                  // %2
+        "=w"(fsum)                                    // %3
+      : "w"(scale)                                    // %4
       : "cc", "memory", "v1", "v2", "v3", "v4", "v5", "v6");
   return fsum;
 }
diff --git a/unit_test/color_test.cc b/unit_test/color_test.cc
index 0aa7a54ac..30b641128 100644
--- a/unit_test/color_test.cc
+++ b/unit_test/color_test.cc
@@ -471,21 +471,22 @@ static void PrintHistogram(int rh[256], int gh[256], int bh[256]) {
   printf("\n");
 }
 
+// Step by 5 on inner loop goes from 0 to 255 inclusive.
+// Set to 1 for better converage.  3, 5 or 17 for faster testing.
+#define FASTSTEP 5
 TEST_F(LibYUVColorTest, TestFullYUV) {
-  int rh[256] =
-      {
-          0,
-      },
-      gh[256] =
-          {
-              0,
-          },
-      bh[256] = {
-          0,
-      };
+  int rh[256] = {
+      0,
+  };
+  int gh[256] = {
+      0,
+  };
+  int bh[256] = {
+      0,
+  };
   for (int u = 0; u < 256; ++u) {
     for (int v = 0; v < 256; ++v) {
-      for (int y2 = 0; y2 < 256; ++y2) {
+      for (int y2 = 0; y2 < 256; y2 += FASTSTEP) {
         int r0, g0, b0, r1, g1, b1;
         int y = RANDOM256(y2);
         YUVToRGBReference(y, u, v, &r0, &g0, &b0);
@@ -503,20 +504,18 @@ TEST_F(LibYUVColorTest, TestFullYUV) {
 }
 
 TEST_F(LibYUVColorTest, TestFullYUVJ) {
-  int rh[256] =
-      {
-          0,
-      },
-      gh[256] =
-          {
-              0,
-          },
-      bh[256] = {
-          0,
-      };
+  int rh[256] = {
+      0,
+  };
+  int gh[256] = {
+      0,
+  };
+  int bh[256] = {
+      0,
+  };
   for (int u = 0; u < 256; ++u) {
     for (int v = 0; v < 256; ++v) {
-      for (int y2 = 0; y2 < 256; ++y2) {
+      for (int y2 = 0; y2 < 256; y2 += FASTSTEP) {
         int r0, g0, b0, r1, g1, b1;
         int y = RANDOM256(y2);
         YUVJToRGBReference(y, u, v, &r0, &g0, &b0);
@@ -532,6 +531,7 @@ TEST_F(LibYUVColorTest, TestFullYUVJ) {
   }
   PrintHistogram(rh, gh, bh);
 }
+#undef FASTSTEP
 
 TEST_F(LibYUVColorTest, TestGreyYUVJ) {
   int r0, g0, b0, r1, g1, b1, r2, g2, b2;