scala/scala — pull request #1383 by paulp (2012-09-22 18:07:02+00:00)
Title: Issue/5604

Retargeting #1376 to master.