Target Scala 2.11 + compiler refactoring