Support for Scala 2.11