Upgrade to Scala 2.10.4