Changes to Scala 2.11.2