Scala 2.10 master merge