scala/scala — pull request #2719 by adriaanm (2013-07-10 20:14:32+00:00)
Title: Rebased #2696

supersedes #2696