Piecing together snippets for scala
Merge remote-tracking branch 'origin/master'
Not sure why this is needed, no differences!