Avoid warnings of boost::coroutine.
Merge branch 'master' into cache_hybrid_strategy