scala/scala — pull request #2906 by retronym (2013-09-04 14:23:08+00:00)
Title: Merge/2.10.x to 2.10.3

`git merge origin/2.10.x`

Review by @JamesIry, /cc @gkossakowski, @adriaanm