Migrate to Scala 2.10

Merged upstream master.