update to Scala-2.10.4
Merge remote-tracking branch 'upstream/master'