Minor changes for Scala 2.10 / sbt 0.13