scala/scala — pull request #3812 by retronym (2014-06-04 07:19:20+00:00)
Title: Merge 2.10.x to 2.11.x

Only a whitespace conflict.