Changes to upgrade to Scala 2.11.