scala/scala — pull request #1885 by paulp (2013-01-12 05:14:59+00:00)
Title: Resolving new merge conflicts between #1844 and master.

Resolved conflicts with Mode. This also represents my lgtm of #1844, so I will merge after the tests pass.