Port to Scala 2.10.2