Merge pull request #4298 from ClaymorePT/boost_1.64.0_r1