scala/scala — pull request #2799 by adriaanm (2013-08-06 23:18:31+00:00)
Title: Rebase #2727

Rebased #2727. Should be good to go, @gkossakowski.