scala/scala — pull request #3113 by adriaanm (2013-11-09 19:52:07+00:00)
Title: Pr rebase 3046

Rebase of #3046, first bumping starr to M6
(Left other versions as-is, as something seems wrong with partest.
Looking into that now.)