merge from https://svn.boost.org/trac/boost/ticket/8883