merged with commit ce46febbd6ef77fac09ab402a904a2b1fac0a67f of https://github.com/olk/boost-task.git