scala/scala — pull request #1919 by paulp (2013-01-17 17:52:48+00:00)
Title: Re-merge of #1906

#1906 went unmergeable; this brings it back.