Prepare for Scala 2.11 build