Merge pull request #3497 from thess/boost-build