merged with commit 32405f7a995e008c75a9cf28fedd09524cbf515c of https://github.com/olk/boost-fiber.git