Small whitespace issues,
To avoid name collisions
Merge branch 'master' of github.com:bwiedermann/scala-labs

* 'master' of github.com:bwiedermann/scala-labs:
  To avoid name collisions