diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..8d294a7be
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,48 @@
+# This is a generic makefile for libyuv for gcc.
+# Caveat: This file will get overwritten by GYP if projects are generated 
+# with GYP_GENERATORS=make
+
+CC=g++
+CCFLAGS=-O2 -fomit-frame-pointer -Iinclude/
+
+LOCAL_OBJ_FILES := \
+    source/compare.o           \
+    source/compare_common.o    \
+    source/compare_posix.o     \
+    source/convert.o           \
+    source/convert_argb.o      \
+    source/convert_from.o      \
+    source/convert_from_argb.o \
+    source/convert_to_argb.o   \
+    source/convert_to_i420.o   \
+    source/cpu_id.o            \
+    source/format_conversion.o \
+    source/planar_functions.o  \
+    source/rotate.o            \
+    source/rotate_argb.o       \
+    source/rotate_mips.o       \
+    source/row_any.o           \
+    source/row_common.o        \
+    source/row_mips.o          \
+    source/row_posix.o         \
+    source/scale.o             \
+    source/scale_argb.o        \
+    source/scale_common.o      \
+    source/scale_mips.o        \
+    source/video_common.o
+
+.cc.o:
+	$(CC) -c $(CCFLAGS) $*.cc -o $*.o
+
+all: libyuv.a convert
+
+libyuv.a: $(LOCAL_OBJ_FILES)
+	$(AR) $(ARFLAGS) -o $@ $(LOCAL_OBJ_FILES)
+
+# A test utility that uses libyuv conversion.
+convert: util/convert.cc
+	$(CC) $(CCFLAGS) -Iutil/ -o $@ util/convert.cc libyuv.a
+
+clean:
+	/bin/rm -f *.o libyuv.a convert
+
diff --git a/README.chromium b/README.chromium
index 3721acdd4..251cd129f 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 856
+Version: 857
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/planar_functions.h b/include/libyuv/planar_functions.h
index 22650f2ad..1d54ddec1 100644
--- a/include/libyuv/planar_functions.h
+++ b/include/libyuv/planar_functions.h
@@ -344,6 +344,7 @@ int MJPGToARGB(const uint8* sample, size_t sample_size,
                uint8* argb, int argb_stride,
                int w, int h, int dw, int dh);
 
+// Internal function - do not call directly.
 // Computes table of cumulative sum for image where the value is the sum
 // of all values above and to the left of the entry. Used by ARGBBlur.
 LIBYUV_API
@@ -352,7 +353,8 @@ int ARGBComputeCumulativeSum(const uint8* src_argb, int src_stride_argb,
                              int width, int height);
 
 // Blur ARGB image.
-// dst_cumsum table of width * height * 16 bytes aligned to 16 byte boundary.
+// dst_cumsum table of width * (height + 1) * 16 bytes aligned to
+//   16 byte boundary.
 // dst_stride32_cumsum is number of ints in a row (width * 4).
 // radius is number of pixels around the center.  e.g. 1 = 3x3. 2=5x5.
 // Blur is optimized for radius of 5 (11x11) or less.
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index cc4d1ed99..f3e47097a 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 856
+#define LIBYUV_VERSION 857
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/unit_test/planar_test.cc b/unit_test/planar_test.cc
index 834e47d20..7759db406 100644
--- a/unit_test/planar_test.cc
+++ b/unit_test/planar_test.cc
@@ -1830,7 +1830,7 @@ static int TestBlur(int width, int height, int benchmark_iterations,
   return max_diff;
 }
 
-static const int kBlurSize = 13;
+static const int kBlurSize = 55;
 TEST_F(libyuvTest, ARGBBlur_Any) {
   int max_diff = TestBlur(benchmark_width_ - 1, benchmark_height_,
                           benchmark_iterations_, +1, 0, kBlurSize);