Migration to Scala 2.10.1