diff --git a/README.chromium b/README.chromium
index 923c55476..2f036bd6b 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 930
+Version: 931
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 002c53f13..06cd726d9 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 930
+#define LIBYUV_VERSION 931
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/planar_functions.cc b/source/planar_functions.cc
index 859193ec6..6fe751083 100644
--- a/source/planar_functions.cc
+++ b/source/planar_functions.cc
@@ -1909,9 +1909,10 @@ static int ARGBSobelize(const uint8* src_argb, int src_stride_argb,
 #endif
   // 3 rows with edges before/after.
   const int kRowSize = (width + kEdge + 15) & ~15;
-  align_buffer_64(row_y, kEdge + kRowSize * 3 + kEdge);
-  align_buffer_64(row_sobelx, width + kEdge);
-  align_buffer_64(row_sobely, width + kEdge);
+  align_buffer_64(rows, kRowSize * 2 + (kEdge + kRowSize * 3 + kEdge));
+  uint8* row_sobelx = rows;
+  uint8* row_sobely = rows + kRowSize;
+  uint8* row_y = rows + kRowSize * 2;
 
   // Convert first row.
   uint8* row_y0 = row_y + kEdge;
@@ -1946,9 +1947,7 @@ static int ARGBSobelize(const uint8* src_argb, int src_stride_argb,
 
     dst_argb += dst_stride_argb;
   }
-  free_aligned_buffer_64(row_y);
-  free_aligned_buffer_64(row_sobelx);
-  free_aligned_buffer_64(row_sobely);
+  free_aligned_buffer_64(rows);
   return 0;
 }