diff --git a/example/future_fallback_to.cpp b/example/future_fallback_to.cpp
index 6b2e36d7..c2c228c3 100644
--- a/example/future_fallback_to.cpp
+++ b/example/future_fallback_to.cpp
@@ -6,6 +6,10 @@
 #define BOOST_THREAD_VERSION 4
 //#define BOOST_THREAD_USES_LOG
 #define BOOST_THREAD_USES_LOG_THREAD_ID
+#include <boost/config.hpp>
+#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
+#endif
 
 #include <boost/thread/detail/log.hpp>
 #include <boost/thread/future.hpp>
diff --git a/example/future_then.cpp b/example/future_then.cpp
index aee16186..fb4f7042 100644
--- a/example/future_then.cpp
+++ b/example/future_then.cpp
@@ -6,6 +6,10 @@
 #define BOOST_THREAD_VERSION 4
 //#define BOOST_THREAD_USES_LOG
 #define BOOST_THREAD_USES_LOG_THREAD_ID
+#include <boost/config.hpp>
+#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
+#endif
 
 #include <boost/thread/detail/log.hpp>
 #include <boost/thread/future.hpp>
@@ -69,7 +73,6 @@ int main()
     try
     {
       BOOST_THREAD_LOG << "" << BOOST_THREAD_END_LOG;
-      //boost::future<int> f1 = boost::async(boost::launch::async, &p1);
       boost::future<int> f1 = boost::async(&p1);
       BOOST_THREAD_LOG << "" << BOOST_THREAD_END_LOG;
       boost::future<int> f2 = f1.then(&p2);
@@ -94,7 +97,6 @@ int main()
     try
     {
       BOOST_THREAD_LOG << "" << BOOST_THREAD_END_LOG;
-      //boost::shared_future<int> f1 = boost::async(boost::launch::async, &p1).share();
       boost::shared_future<int> f1 = boost::async(&p1).share();
       BOOST_THREAD_LOG << "" << BOOST_THREAD_END_LOG;
       boost::future<int> f2 = f1.then(&p2s);
diff --git a/example/future_unwrap.cpp b/example/future_unwrap.cpp
index 448ee414..3b7b2850 100644
--- a/example/future_unwrap.cpp
+++ b/example/future_unwrap.cpp
@@ -6,6 +6,10 @@
 #define BOOST_THREAD_VERSION 4
 //#define BOOST_THREAD_USES_LOG
 #define BOOST_THREAD_USES_LOG_THREAD_ID
+#include <boost/config.hpp>
+#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
+#endif
 
 #include <boost/thread/detail/log.hpp>
 #include <boost/thread/future.hpp>
diff --git a/example/lambda_future.cpp b/example/lambda_future.cpp
index e2212fa8..49a3a18f 100644
--- a/example/lambda_future.cpp
+++ b/example/lambda_future.cpp
@@ -11,6 +11,10 @@
 #define BOOST_THREAD_VERSION 4
 //#define BOOST_THREAD_USES_LOG
 #define BOOST_THREAD_USES_LOG_THREAD_ID
+#include <boost/config.hpp>
+#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
+#endif
 
 #include <boost/thread/detail/log.hpp>
 #include <boost/thread/future.hpp>
diff --git a/example/make_future.cpp b/example/make_future.cpp
index 581e2a98..bef89db3 100644
--- a/example/make_future.cpp
+++ b/example/make_future.cpp
@@ -5,6 +5,11 @@
 
 #define BOOST_THREAD_VERSION 4
 
+#include <boost/config.hpp>
+#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
+#endif
+
 #include <boost/thread/future.hpp>
 #include <iostream>
 
@@ -55,6 +60,11 @@ int main()
   for (int i=0; i< number_of_tests; i++)
   try
   {
+    {
+    std::cout << __FILE__ << " "<<__LINE__ << std::endl;
+    boost::future<int> f = boost::async(boost::launch::async, p1);
+    std::cout << i << " "<<f.get() << std::endl;
+    }
 #if defined BOOST_THREAD_USES_MOVE
   {
     std::cout << __FILE__ << " "<< __LINE__ << std::endl;
diff --git a/include/boost/thread/detail/config.hpp b/include/boost/thread/detail/config.hpp
index d7de7e81..5ef70c15 100644
--- a/include/boost/thread/detail/config.hpp
+++ b/include/boost/thread/detail/config.hpp
@@ -239,7 +239,8 @@
     ! defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && \
     ! defined(BOOST_NO_CXX11_DECLTYPE) && \
     ! defined(BOOST_NO_CXX11_DECLTYPE_N3276) && \
-    ! defined(BOOST_NO_CXX11_AUTO) && \
+    ! defined(BOOST_THREAD_NO_CXX11_DECLTYPE_N3276) && \
+    ! defined(BOOST_NO_CXX11_TRAILING_RESULT_TYPES) && \
     ! defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && \
     ! defined(BOOST_NO_CXX11_HDR_TUPLE)
 
diff --git a/include/boost/thread/detail/invoke.hpp b/include/boost/thread/detail/invoke.hpp
index 3a085232..c56126b6 100644
--- a/include/boost/thread/detail/invoke.hpp
+++ b/include/boost/thread/detail/invoke.hpp
@@ -44,7 +44,8 @@ namespace boost
     ! defined(BOOST_NO_SFINAE_EXPR) && \
     ! defined(BOOST_NO_CXX11_DECLTYPE) && \
     ! defined(BOOST_NO_CXX11_DECLTYPE_N3276) && \
-    ! defined(BOOST_NO_CXX11_AUTO)
+    ! defined(BOOST_THREAD_NO_CXX11_DECLTYPE_N3276) && \
+    ! defined(BOOST_NO_CXX11_TRAILING_RESULT_TYPES)
 
 #define BOOST_THREAD_PROVIDES_INVOKE
 
diff --git a/include/boost/thread/future.hpp b/include/boost/thread/future.hpp
index c85ff863..b0ee70ee 100644
--- a/include/boost/thread/future.hpp
+++ b/include/boost/thread/future.hpp
@@ -278,10 +278,11 @@ namespace boost
             void do_continuation(boost::unique_lock<boost::mutex>& lock)
             {
                 if (continuation_ptr) {
-                  continuation_ptr->launch_continuation(lock);
-                  if (! lock.owns_lock())
-                    lock.lock();
+                  continuation_ptr_type this_continuation_ptr = continuation_ptr;
                   continuation_ptr.reset();
+                  this_continuation_ptr->launch_continuation(lock);
+                  //if (! lock.owns_lock())
+                  //  lock.lock();
                 }
             }
 #else
@@ -679,13 +680,15 @@ namespace boost
 
             virtual move_dest_type get()
             {
-                wait();
+                boost::unique_lock<boost::mutex> lock(mutex);
+                wait_internal(lock);
                 return boost::move(*result);
             }
 
             virtual shared_future_get_result_type get_sh()
             {
-                wait();
+                boost::unique_lock<boost::mutex> lock(mutex);
+                wait_internal(lock);
                 return *result;
             }
 
@@ -755,13 +758,15 @@ namespace boost
 
             virtual T& get()
             {
-                wait();
+                boost::unique_lock<boost::mutex> lock(mutex);
+                wait_internal(lock);
                 return *result;
             }
 
             virtual T& get_sh()
             {
-                wait();
+                boost::unique_lock<boost::mutex> lock(mutex);
+                wait_internal(lock);
                 return *result;
             }
 
@@ -803,12 +808,14 @@ namespace boost
 
             virtual void get()
             {
-                this->wait();
+                boost::unique_lock<boost::mutex> lock(mutex);
+                this->wait_internal(lock);
             }
 
             virtual void get_sh()
             {
-                wait();
+                boost::unique_lock<boost::mutex> lock(mutex);
+                this->wait_internal(lock);
             }
 
             void set_value_at_thread_exit()
@@ -4051,9 +4058,9 @@ namespace boost
       {
       }
 
-      void launch_continuation(boost::unique_lock<boost::mutex>& lock)
+      void launch_continuation(boost::unique_lock<boost::mutex>& )
       {
-        lock.unlock();
+        //lock.unlock();
         this->thr_ = thread(&future_async_continuation_shared_state::run, this);
       }
 
@@ -4095,9 +4102,9 @@ namespace boost
       {
       }
 
-      void launch_continuation(boost::unique_lock<boost::mutex>& lk)
+      void launch_continuation(boost::unique_lock<boost::mutex>& )
       {
-        lk.unlock();
+        //lk.unlock();
         this->thr_ = thread(&future_async_continuation_shared_state::run, this);
       }