Text changes
Merge branch 'master' into scala-2.10
Updated text
Merge branch 'master' into scala-2.10