Scala 2.11.1 upgrade