Merge pull request #3492 from thess/boost-build