separate scala-2.10 branch
Support Scala 2.11.