Dependency bumps.
Merge branch 'master' into 2.10.x
Bump to Scala 2.10.1