diff --git a/3rdParty/V8-4.3.61/build/standalone.gypi b/3rdParty/V8-4.3.61/build/standalone.gypi
index 205f924b24..62951b15e7 100644
--- a/3rdParty/V8-4.3.61/build/standalone.gypi
+++ b/3rdParty/V8-4.3.61/build/standalone.gypi
@@ -338,7 +338,7 @@
           # Don't warn about the "struct foo f = {0};" initialization pattern.
           '-Wno-missing-field-initializers',
         ],
-        'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-std=gnu++0x' ],
+        'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-std=gnu++11' ],
         'ldflags': [ '-pthread', ],
         'conditions': [
           [ 'host_arch=="ppc64" and OS!="aix"', {
@@ -365,7 +365,7 @@
           # Don't warn about the "struct foo f = {0};" initialization pattern.
           '-Wno-missing-field-initializers',
         ],
-        'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-std=gnu++0x' ],
+        'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-std=gnu++11' ],
         'conditions': [
           [ 'visibility=="hidden"', {
             'cflags': [ '-fvisibility=hidden' ],
@@ -516,7 +516,7 @@
           ['clang==1', {
             'xcode_settings': {
               'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
-              'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++0x',  # -std=gnu++0x
+              'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++11',  # -std=gnu++11
             },
           }],
         ],
diff --git a/CHANGELOG b/CHANGELOG
index 5ff4d1a891..c0d0c4f13a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -714,6 +714,9 @@ v2.6.0-beta4 (2015-06-16)
   This is controlled by the `indexBuckets` attribute in the `properties`
   of the collection.
 
+* fix a cluster deadlock bug in larger clusters by marking a thread waiting
+  for a lock on a DBserver as blocked
+
 
 v2.5.4 (2015-05-14)
 -------------------