scala/scala — pull request #2647 by retronym (2013-06-10 10:23:23+00:00)
Title: merge 2.10.x to master

Review by @gkossakowski