Migrated to Scala 2.11.0