Changed to Scala 2.10
Merge branch 'master' into scala-2.10
Updated to *latest* Scala 2.10
Merge branch 'master' into scala-2.10