Upgraded from Scala 2.10 to 2.11