Merge pull request #1487 from thess/boost-build-fix