merged with commit 91a65f27bd870b3c19ba3c62ea372da337e91b52 of https://github.com/olk/boost-context.git