Merge pull request #560 from dart-lang/stable-to-7-x

Stable to 7 x