scala/scala — pull request #2803 by adriaanm (2013-08-08 19:00:32+00:00)
Title: Rebase #2728

Rebase #2728