Switching to Scala 2.10