scala/scala — pull request #3160 by retronym (2013-11-19 19:46:07+00:00)
Title: Fix implicit divergence regression

With a sprinkling of additional cleanup.

Review by @adriaanm

/cc @szeiger