diff --git a/README.chromium b/README.chromium
index 12a3d18cc..beb184d85 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1589
+Version: 1590
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 0162956c6..c2f7e4096 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 1589
+#define LIBYUV_VERSION 1590
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/unit_test/unit_test.h b/unit_test/unit_test.h
index ae9c9c20b..2d62b1e7f 100644
--- a/unit_test/unit_test.h
+++ b/unit_test/unit_test.h
@@ -22,6 +22,16 @@
 
 #include "libyuv/basic_types.h"
 
+#ifndef SIMD_ALIGNED
+#if defined(_MSC_VER) && !defined(__CLR_VER)
+#define SIMD_ALIGNED(var) __declspec(align(16)) var
+#elif defined(__GNUC__) && !defined(__pnacl__)
+#define SIMD_ALIGNED(var) var __attribute__((aligned(16)))
+#else
+#define SIMD_ALIGNED(var) var
+#endif
+#endif
+
 static __inline int Abs(int v) {
   return v >= 0 ? v : -v;
 }
@@ -31,11 +41,11 @@ static __inline int Abs(int v) {
 // Scaling uses 16.16 fixed point to step thru the source image, so a
 // maximum size of 32767.999 can be expressed.  32768 is valid because
 // the step is 1 beyond the image but not used.
-// Destination size is mainly constrained by valid scale step not the 
+// Destination size is mainly constrained by valid scale step not the
 // absolute size, so it may be possible to relax the destination size
 // constraint.
 // Source size is unconstrained for most specialized scalers.  e.g.
-// An image of 65536 scaled to half size would be valid.  The test 
+// An image of 65536 scaled to half size would be valid.  The test
 // could be relaxed for special scale factors.
 // If this test is removed, the scaling function should gracefully
 // fail with a return code.  The test could be changed to know that