diff --git a/bootcode.bin b/bootcode.bin
index 3787295f3e70..263bf6d72760 100644
Binary files a/bootcode.bin and b/bootcode.bin differ
diff --git a/fixup.dat b/fixup.dat
index 0d716723cb12..b967dc024e49 100644
Binary files a/fixup.dat and b/fixup.dat differ
diff --git a/fixup_cd.dat b/fixup_cd.dat
index feb4fe22d3b8..627a13cd2a64 100644
Binary files a/fixup_cd.dat and b/fixup_cd.dat differ
diff --git a/fixup_x.dat b/fixup_x.dat
index f32e41b73fad..e72f59f08ef2 100644
Binary files a/fixup_x.dat and b/fixup_x.dat differ
diff --git a/git_hash b/git_hash
index fc275386f236..58b6eb9693ae 100644
--- a/git_hash
+++ b/git_hash
@@ -1 +1 @@
-c3db7205bcd8988cf7c185e50c8849542554b1f5
+4d496bf82c6e4546de64061134bb902bd64f07a7
diff --git a/kernel.img b/kernel.img
index 86538c941f34..e46360cbdd55 100644
Binary files a/kernel.img and b/kernel.img differ
diff --git a/modules/3.12.19+/kernel/drivers/i2c/busses/i2c-bcm2708.ko b/modules/3.12.19+/kernel/drivers/i2c/busses/i2c-bcm2708.ko
index f107e546238f..74b395cfb64a 100644
Binary files a/modules/3.12.19+/kernel/drivers/i2c/busses/i2c-bcm2708.ko and b/modules/3.12.19+/kernel/drivers/i2c/busses/i2c-bcm2708.ko differ
diff --git a/modules/3.12.19+/kernel/drivers/media/platform/bcm2835/bcm2835-v4l2.ko b/modules/3.12.19+/kernel/drivers/media/platform/bcm2835/bcm2835-v4l2.ko
index bc6b9b255bc7..07e1dbccf4c0 100644
Binary files a/modules/3.12.19+/kernel/drivers/media/platform/bcm2835/bcm2835-v4l2.ko and b/modules/3.12.19+/kernel/drivers/media/platform/bcm2835/bcm2835-v4l2.ko differ
diff --git a/start.elf b/start.elf
index 14802f5db020..9720a83699b6 100644
Binary files a/start.elf and b/start.elf differ
diff --git a/start_cd.elf b/start_cd.elf
index a0570494f960..20f50933ecd7 100644
Binary files a/start_cd.elf and b/start_cd.elf differ
diff --git a/start_x.elf b/start_x.elf
index 251d457490a2..0d712d7eba26 100644
Binary files a/start_x.elf and b/start_x.elf differ
diff --git a/vc/hardfp/opt/vc/lib/libEGL_static.a b/vc/hardfp/opt/vc/lib/libEGL_static.a
index b2ef55d3c643..d36c3c70fd22 100644
Binary files a/vc/hardfp/opt/vc/lib/libEGL_static.a and b/vc/hardfp/opt/vc/lib/libEGL_static.a differ
diff --git a/vc/hardfp/opt/vc/lib/libGLESv2_static.a b/vc/hardfp/opt/vc/lib/libGLESv2_static.a
index fd37250b1082..dff2bb1cc356 100644
Binary files a/vc/hardfp/opt/vc/lib/libGLESv2_static.a and b/vc/hardfp/opt/vc/lib/libGLESv2_static.a differ
diff --git a/vc/hardfp/opt/vc/lib/libkhrn_client.a b/vc/hardfp/opt/vc/lib/libkhrn_client.a
index 56af0a8736dd..0d13eaeb22b3 100644
Binary files a/vc/hardfp/opt/vc/lib/libkhrn_client.a and b/vc/hardfp/opt/vc/lib/libkhrn_client.a differ
diff --git a/vc/hardfp/opt/vc/lib/libkhrn_static.a b/vc/hardfp/opt/vc/lib/libkhrn_static.a
index 515da24f3343..bde265c29b71 100644
Binary files a/vc/hardfp/opt/vc/lib/libkhrn_static.a and b/vc/hardfp/opt/vc/lib/libkhrn_static.a differ
diff --git a/vc/hardfp/opt/vc/lib/libvcfiled_check.a b/vc/hardfp/opt/vc/lib/libvcfiled_check.a
index ec67d27ac0a2..64f887642769 100644
Binary files a/vc/hardfp/opt/vc/lib/libvcfiled_check.a and b/vc/hardfp/opt/vc/lib/libvcfiled_check.a differ
diff --git a/vc/hardfp/opt/vc/lib/libvchostif.a b/vc/hardfp/opt/vc/lib/libvchostif.a
index 45b69c5e27f6..59db474b0e84 100644
Binary files a/vc/hardfp/opt/vc/lib/libvchostif.a and b/vc/hardfp/opt/vc/lib/libvchostif.a differ
diff --git a/vc/hardfp/opt/vc/lib/libvmcs_rpc_client.a b/vc/hardfp/opt/vc/lib/libvmcs_rpc_client.a
index 96be4671313e..5fd8aa682582 100644
Binary files a/vc/hardfp/opt/vc/lib/libvmcs_rpc_client.a and b/vc/hardfp/opt/vc/lib/libvmcs_rpc_client.a differ
diff --git a/vc/sdk/opt/vc/src/hello_pi/hello_fft/gpu_fft.txt b/vc/sdk/opt/vc/src/hello_pi/hello_fft/gpu_fft.txt
index 6768fa11920b..a6e6a1d9893c 100644
--- a/vc/sdk/opt/vc/src/hello_pi/hello_fft/gpu_fft.txt
+++ b/vc/sdk/opt/vc/src/hello_pi/hello_fft/gpu_fft.txt
@@ -104,3 +104,26 @@ It accepts three optional command-line arguments: <log2_N> <batch> <loops>
 
 The special character device is required for the ioctl mailbox through which
 the ARM communicates with the Videocore GPU.
+
+
+*** With Open GL ***
+
+GPU_FFT and Open GL will run concurrently if the GPU_FFT_MEM_* defines in
+file gpu_fft.c are changed as follows:
+
+#define GPU_FFT_MEM_FLG 0x4        // cached=0xC; direct=0x4
+#define GPU_FFT_MEM_MAP 0x20000000 // cached=0x0; direct=0x20000000
+
+Overall performance will probably be higher if GPU_FFT and Open GL take turns
+at using the 3D hardware.  Since eglSwapBuffers() returns immediately without
+waiting for rendering, call glFlush() and glFinish() afterwards as follows:
+
+    for (;;) {
+        ....
+        eglSwapBuffers(....); // non-blocking call returns immediately
+        glFlush();
+        glFinish(); // wait until V3D hardware is idle
+        ....
+        gpu_fft_execute(....); // blocking call
+        ....
+    }
diff --git a/vc/softfp/opt/vc/lib/libEGL_static.a b/vc/softfp/opt/vc/lib/libEGL_static.a
index 443ee06c3454..444125afadac 100644
Binary files a/vc/softfp/opt/vc/lib/libEGL_static.a and b/vc/softfp/opt/vc/lib/libEGL_static.a differ
diff --git a/vc/softfp/opt/vc/lib/libGLESv2_static.a b/vc/softfp/opt/vc/lib/libGLESv2_static.a
index 14d8cd117842..ded334d82406 100644
Binary files a/vc/softfp/opt/vc/lib/libGLESv2_static.a and b/vc/softfp/opt/vc/lib/libGLESv2_static.a differ
diff --git a/vc/softfp/opt/vc/lib/libkhrn_client.a b/vc/softfp/opt/vc/lib/libkhrn_client.a
index 8d292c222f54..88ce8c5c6ae8 100644
Binary files a/vc/softfp/opt/vc/lib/libkhrn_client.a and b/vc/softfp/opt/vc/lib/libkhrn_client.a differ
diff --git a/vc/softfp/opt/vc/lib/libkhrn_static.a b/vc/softfp/opt/vc/lib/libkhrn_static.a
index d25feeaf5f90..c62318e31e39 100644
Binary files a/vc/softfp/opt/vc/lib/libkhrn_static.a and b/vc/softfp/opt/vc/lib/libkhrn_static.a differ
diff --git a/vc/softfp/opt/vc/lib/libvcfiled_check.a b/vc/softfp/opt/vc/lib/libvcfiled_check.a
index 390eb8884b25..6c2005499350 100644
Binary files a/vc/softfp/opt/vc/lib/libvcfiled_check.a and b/vc/softfp/opt/vc/lib/libvcfiled_check.a differ
diff --git a/vc/softfp/opt/vc/lib/libvchostif.a b/vc/softfp/opt/vc/lib/libvchostif.a
index 2d653f2af3ee..991db756c431 100644
Binary files a/vc/softfp/opt/vc/lib/libvchostif.a and b/vc/softfp/opt/vc/lib/libvchostif.a differ
diff --git a/vc/softfp/opt/vc/lib/libvmcs_rpc_client.a b/vc/softfp/opt/vc/lib/libvmcs_rpc_client.a
index ade7d5878a43..b7bf85d4d847 100644
Binary files a/vc/softfp/opt/vc/lib/libvmcs_rpc_client.a and b/vc/softfp/opt/vc/lib/libvmcs_rpc_client.a differ