Scala 2.10

This is the update to latest master. (I hope it is final !)