Migrate to Scala 2.10, close #895, close #887