Apply patch from #8408.
Fixes #8408.

git-svn-id: http://svn.boost.org/svn/boost/trunk@83958 b8fc166d-592f-0410-95f2-cb63ce0dd405