scala/scala — pull request #2694 by adriaanm (2013-06-28 17:11:04+00:00)
Title: Merge 2.10.x into master

Review by @gkossakowski