Support for Scala 2.9.1-1