scala/scala — pull request #3150 by adriaanm (2013-11-17 23:02:28+00:00)
Title: WIP: rebase of #3117

WIP: rebase of #3117