scala/scala — pull request #3496 by adriaanm (2014-02-10 03:10:11+00:00)
Title: SI-6169 TODO: consolidate with fix for SI-1786 (#2518)

TODO comments only

please merge when convenient