Merge with upstream at https://github.com/dart-lang/bleeding_edge/commit/b4d28437d67c5bde8a3566ec20aaa1ada54bb281