2.10.4-RC2

Generates: https://github.com/scala/scala-lang/pull/156

Review by @adriaanm