Scala 2.9 backports

simple cherry picks from scala-2.10. No need for review.