diff --git a/doc/91_relnotes.qbk b/doc/91_relnotes.qbk
index 074d3a8..a007b76 100644
--- a/doc/91_relnotes.qbk
+++ b/doc/91_relnotes.qbk
@@ -20,7 +20,7 @@
   * you can swap optional references: it is like swapping pointers: shalow, underlying objects are not affected,
   * optional references to abstract types work.
 * Documented nested typedefs ([@https://svn.boost.org/trac/boost/ticket/5193 Trac #5193]).
-* Made the perfect-forwarding constructor SFINAE-friendly, which fixes [@https://svn.boost.org/trac/boost/ticket/12002 Trac #12002]. However, this only works in the newer compilers that implement variadic macros and `decltype` correctly.
+* Made the perfect-forwarding constructor SFINAE-friendly, which fixes [@https://svn.boost.org/trac/boost/ticket/12002 Trac #12002]. However, this only works in the newer platforms that correctly implement C++11 `<type_traits>`.
 
 [heading Boost Release 1.60]
 
diff --git a/doc/html/boost_optional/relnotes.html b/doc/html/boost_optional/relnotes.html
index 50ddc8e..50857ef 100644
--- a/doc/html/boost_optional/relnotes.html
+++ b/doc/html/boost_optional/relnotes.html
@@ -62,8 +62,8 @@
         </li>
 <li class="listitem">
           Made the perfect-forwarding constructor SFINAE-friendly, which fixes <a href="https://svn.boost.org/trac/boost/ticket/12002" target="_top">Trac #12002</a>.
-          However, this only works in the newer compilers that implement variadic
-          macros and <code class="computeroutput"><span class="keyword">decltype</span></code> correctly.
+          However, this only works in the newer platforms that correctly implement
+          C++11 <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">type_traits</span><span class="special">&gt;</span></code>.
         </li>
 </ul></div>
 <h4>
diff --git a/doc/html/index.html b/doc/html/index.html
index b3bf68a..f3c24d2 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -144,7 +144,7 @@
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: February 19, 2016 at 17:45:39 GMT</small></p></td>
+<td align="left"><p><small>Last revised: March 05, 2016 at 22:17:22 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
diff --git a/include/boost/optional/optional.hpp b/include/boost/optional/optional.hpp
index 46717fe..ff1a16c 100644
--- a/include/boost/optional/optional.hpp
+++ b/include/boost/optional/optional.hpp
@@ -578,8 +578,9 @@ struct is_optional_related
     boost::true_type, boost::false_type>::type
 {};
 
-#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800) && !BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40500)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800) && !BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40500) && !defined(__SUNPRO_CC)
   // this condition is a copy paste from is_constructible.hpp
+  // I also disable SUNPRO, as it seems not to support type_traits correctly
   
 template <typename T, typename U>
 struct is_convertible_to_T_or_factory