takako shimamoto

+1

@takezoe , sorry for the late response. Basically, I agree with incorporating them into the main repository. I'm concerned about the following before this PR. - What templates we incorporate...

@EmergentOrder All tests are being run with Scala 2.11 because you haven't fixed .travis.yml.

@testflyjets As with #498, would you please create a branch from livedoc?

@testflyjets Thank you for your contribution! patch-2 branch is created from develop, so would you please create a branch from livedoc?

@adriancole Do you mean it is better to fix as follows: ```scala Option(contextOrFlags.context()) .map(tracer.joinSpan) .getOrElse(tracer.nextSpan(contextOrFlags)) ```

I think this looks good.

You are right. The version of brave is old. OK, we will handle this soon.