scala/scala — pull request #3669 by adriaanm (2014-03-31 18:11:03+00:00)
Title: SI-8460 Fix regression in implicit divergence recovery

Minor rework of #3667.

Review by @retronym.