Changes specific to Scala 2.11.