Move to Scala 2.11