Prepare for building on Scala 2.11.0