Upgrade to Scala 2.11