Fix docjavatag conversion of TagAnnotation.java
Merge remote-tracking branch 'upstream/master'
Update sbt doc build
Merge branch 'master' of https://github.com/gcberger/scalatest