Merge pull request #2100 from ClaymorePT/boost_8