This is an upstream backport that deals with an API change in Boost. Signed-off-by: Rosen Penev <rosenp@gmail.com>