bug fix 16271
Merge branch 'master' of https://github.com/dart-lang/one-hour-codelab