Upgrade Scala 2.10.4, close #1723