fixed https://svn.boost.org/trac/boost/ticket/9658
Merge branch 'develop'