Moving to Scala 2.11.1