Upstream change to scala-mode