Updated scala-mode2
Merge branch 'master' into next
Merge remote-tracking branch 'origin/next'
Updated Scala-mode2