scala/scala — pull request #3051 by retronym (2013-10-18 14:19:34+00:00)
Title: Merge 2.10.x to master (again)

Merging eagerly to disable flaky tests.