updates following scala/scala.github.com@6a9d70