scala/scala — pull request #3384 by adriaanm (2014-01-18 18:46:23+00:00)
Title: Merge 2.10.x

forgot one PR from the 2.10.4-RC2 queue

clean merge, luckily -- review by @retronym