Scala 2.11 ready