Scala updates and workarounds

@BanzaiMan this will be awesome to get this in the next VM update, but I need first to get bf31642
 workaround reviewed by Scala/sbt people.