=pro #15045 Adjust build for Scala 2.11.0