Bring 1.1.x branch to Scala 2.11