scala/scala — pull request #3269 by dotta (2013-12-12 16:33:41+00:00)
Title: Issue/si 4287

This is a rework of https://github.com/scala/scala/pull/3210

review by @retronym, @densh