Merge pull request #3668 from hauke/boost