Revert, turns out that M4 is arriving today :)
Merge branch 'master' of github.com:scala/scala-lang