clean up
Merge branch 'master' into scala-2.9.2