scala/scala — pull request #1842 by adriaanm (2013-01-04 20:51:58+00:00)
Title: Backport 1821

backport of #1821