Migrate to Scala 2.10