scala/scala — pull request #3181 by heathermiller (2013-11-22 16:36:29+00:00)
Title: SI-6913 Reapplies a lost fix by @viktorklang

https://issues.scala-lang.org/browse/SI-6913

This somehow got lost. Thanks to @rkuhn for pointing it out.