Bring 1.1.x branch to Scala 2.11

yeah, but not for the 2.10