Preparing for Scala 2.11.0