Upgrading to Scala 2.11