diff --git a/doc/history.qbk b/doc/history.qbk
index 2dde9f8..eab17d1 100644
--- a/doc/history.qbk
+++ b/doc/history.qbk
@@ -7,6 +7,12 @@
 
 [section:history History]
 
+[h4 Boost 1.56.0]
+
+* Fixed issues [@https://svn.boost.org/trac/boost/ticket/7317 #7317],
+[@https://svn.boost.org/trac/boost/ticket/9474 #9474].
+
+
 [h4 Boost 1.55.0]
 
 * Added new trait __is_copy_constructible.
diff --git a/doc/html/boost_typetraits/history.html b/doc/html/boost_typetraits/history.html
index 78cea8a..b957b2e 100644
--- a/doc/html/boost_typetraits/history.html
+++ b/doc/html/boost_typetraits/history.html
@@ -28,6 +28,15 @@
 </h2></div></div></div>
 <h5>
 <a name="boost_typetraits.history.h0"></a>
+      <span class="phrase"><a name="boost_typetraits.history.boost_1_56_0"></a></span><a class="link" href="history.html#boost_typetraits.history.boost_1_56_0">Boost
+      1.56.0</a>
+    </h5>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+          Fixed issues <a href="https://svn.boost.org/trac/boost/ticket/7317" target="_top">#7317</a>,
+          <a href="https://svn.boost.org/trac/boost/ticket/9474" target="_top">#9474</a>.
+        </li></ul></div>
+<h5>
+<a name="boost_typetraits.history.h1"></a>
       <span class="phrase"><a name="boost_typetraits.history.boost_1_55_0"></a></span><a class="link" href="history.html#boost_typetraits.history.boost_1_55_0">Boost
       1.55.0</a>
     </h5>
@@ -35,7 +44,7 @@
           Added new trait <a class="link" href="reference/is_copy_constructible.html" title="is_copy_constructible">is_copy_constructible</a>.
         </li></ul></div>
 <h5>
-<a name="boost_typetraits.history.h1"></a>
+<a name="boost_typetraits.history.h2"></a>
       <span class="phrase"><a name="boost_typetraits.history.boost_1_54_0"></a></span><a class="link" href="history.html#boost_typetraits.history.boost_1_54_0">Boost
       1.54.0</a>
     </h5>
@@ -46,7 +55,7 @@
           <a class="link" href="reference/has_trivial_move_constructor.html" title="has_trivial_move_constructor">has_trivial_move_constructor</a>.
         </li></ul></div>
 <h5>
-<a name="boost_typetraits.history.h2"></a>
+<a name="boost_typetraits.history.h3"></a>
       <span class="phrase"><a name="boost_typetraits.history.boost_1_47_0"></a></span><a class="link" href="history.html#boost_typetraits.history.boost_1_47_0">Boost
       1.47.0</a>
     </h5>
@@ -61,7 +70,7 @@
         </li>
 </ul></div>
 <h5>
-<a name="boost_typetraits.history.h3"></a>
+<a name="boost_typetraits.history.h4"></a>
       <span class="phrase"><a name="boost_typetraits.history.boost_1_45_0"></a></span><a class="link" href="history.html#boost_typetraits.history.boost_1_45_0">Boost
       1.45.0</a>
     </h5>
@@ -78,7 +87,7 @@
         </li>
 </ul></div>
 <h5>
-<a name="boost_typetraits.history.h4"></a>
+<a name="boost_typetraits.history.h5"></a>
       <span class="phrase"><a name="boost_typetraits.history.boost_1_44_0"></a></span><a class="link" href="history.html#boost_typetraits.history.boost_1_44_0">Boost
       1.44.0</a>
     </h5>
@@ -95,7 +104,7 @@
         </li>
 </ul></div>
 <h5>
-<a name="boost_typetraits.history.h5"></a>
+<a name="boost_typetraits.history.h6"></a>
       <span class="phrase"><a name="boost_typetraits.history.boost_1_42_0"></a></span><a class="link" href="history.html#boost_typetraits.history.boost_1_42_0">Boost
       1.42.0</a>
     </h5>
diff --git a/doc/html/index/s11.html b/doc/html/index/s11.html
index a346240..1f9c4cc 100644
--- a/doc/html/index/s11.html
+++ b/doc/html/index/s11.html
@@ -24,7 +24,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="idm1549747536"></a>Class Index</h2></div></div></div>
+<a name="idm1547040384"></a>Class Index</h2></div></div></div>
 <p><a class="link" href="s11.html#idx_id_0">A</a> <a class="link" href="s11.html#idx_id_2">C</a> <a class="link" href="s11.html#idx_id_3">D</a> <a class="link" href="s11.html#idx_id_4">E</a> <a class="link" href="s11.html#idx_id_5">F</a> <a class="link" href="s11.html#idx_id_6">H</a> <a class="link" href="s11.html#idx_id_7">I</a> <a class="link" href="s11.html#idx_id_8">M</a> <a class="link" href="s11.html#idx_id_9">N</a> <a class="link" href="s11.html#idx_id_10">O</a> <a class="link" href="s11.html#idx_id_11">P</a> <a class="link" href="s11.html#idx_id_12">R</a> <a class="link" href="s11.html#idx_id_13">T</a></p>
 <div class="variablelist"><dl class="variablelist">
 <dt>
diff --git a/doc/html/index/s12.html b/doc/html/index/s12.html
index 329e366..64486a6 100644
--- a/doc/html/index/s12.html
+++ b/doc/html/index/s12.html
@@ -24,7 +24,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="idm1549367376"></a>Typedef Index</h2></div></div></div>
+<a name="idm1546660224"></a>Typedef Index</h2></div></div></div>
 <p><a class="link" href="s12.html#idx_id_20">F</a> <a class="link" href="s12.html#idx_id_27">R</a> <a class="link" href="s12.html#idx_id_28">T</a></p>
 <div class="variablelist"><dl class="variablelist">
 <dt>
diff --git a/doc/html/index/s13.html b/doc/html/index/s13.html
index ccc5a60..bbb245f 100644
--- a/doc/html/index/s13.html
+++ b/doc/html/index/s13.html
@@ -24,7 +24,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="idm1549349456"></a>Macro Index</h2></div></div></div>
+<a name="idm1546642304"></a>Macro Index</h2></div></div></div>
 <p><a class="link" href="s13.html#idx_id_31">B</a></p>
 <div class="variablelist"><dl class="variablelist">
 <dt>
diff --git a/doc/html/index/s14.html b/doc/html/index/s14.html
index 01d985e..05626dc 100644
--- a/doc/html/index/s14.html
+++ b/doc/html/index/s14.html
@@ -23,7 +23,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="idm1549290448"></a>Index</h2></div></div></div>
+<a name="idm1546583296"></a>Index</h2></div></div></div>
 <p><a class="link" href="s14.html#idx_id_45">A</a> <a class="link" href="s14.html#idx_id_46">B</a> <a class="link" href="s14.html#idx_id_47">C</a> <a class="link" href="s14.html#idx_id_48">D</a> <a class="link" href="s14.html#idx_id_49">E</a> <a class="link" href="s14.html#idx_id_50">F</a> <a class="link" href="s14.html#idx_id_51">H</a> <a class="link" href="s14.html#idx_id_52">I</a> <a class="link" href="s14.html#idx_id_53">M</a> <a class="link" href="s14.html#idx_id_54">N</a> <a class="link" href="s14.html#idx_id_55">O</a> <a class="link" href="s14.html#idx_id_56">P</a> <a class="link" href="s14.html#idx_id_57">R</a> <a class="link" href="s14.html#idx_id_58">T</a> <a class="link" href="s14.html#idx_id_59">U</a></p>
 <div class="variablelist"><dl class="variablelist">
 <dt>
diff --git a/include/boost/type_traits/remove_cv.hpp b/include/boost/type_traits/remove_cv.hpp
index 997a19f..9ba34a1 100644
--- a/include/boost/type_traits/remove_cv.hpp
+++ b/include/boost/type_traits/remove_cv.hpp
@@ -28,7 +28,7 @@ namespace detail{
 template <class T>
 struct rvalue_ref_filter_rem_cv
 {
-   typedef typename boost::detail::cv_traits_imp<T*>::unqualified_type type;
+   typedef typename boost::detail::cv_traits_imp<BOOST_TT_AUX_CV_TRAITS_IMPL_PARAM(T)>::unqualified_type type;
 };
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES