Update to Scala 2.11