scala/scala — pull request #3228 by retronym (2013-12-06 11:17:11+00:00)
Title: Merge #3209 and 2.10.x to master

Review by @dotta

This is a superset of #3227