backport of https://github.com/scala/scala/pull/3022
Merge remote-tracking branch 'origin/2.10.3-RC1' into 2.10.3