Port branch to Scala 2.10, make tests compile again, bump version

The port is done by cherry-picking changes from main.
Unsurprisingly, tests currently only compile, but some fail; I did not investigate this further.