Updated to *latest* Scala 2.10