Port manually wip-merge to Scala 2.10.0

Only compile-tested
Change version number

This allows to:
* identify the branch from which the build comes from
* have a different artifact ID from the older version, based on a binary-incompatibleScala release.