scala/scala — pull request #2419 by retronym (2013-04-20 09:25:50+00:00)
Title: Merge v2.10.1-245-g5147bb2 to master

... and the 2.11 incarnation of SI-7377, 962f88e.

Review by @paulp