Update from dart-lang:master