Wrong branch (Revert "Port to Scala 2.10.2")

This reverts commit 2aea2649f6db7a728cb3b7df1d04d5e28fa3b88e.