Merge pull request #2145 from ClaymorePT/boost_1