scala/scala — pull request #1757 by paulp (2012-12-11 20:59:54+00:00)
Title: Merge 2.10.x into master.

Not the world's easiest merge; please @xeno-by, @adriaan review to make sure I didn't bork something.