Merge branch 'master' of https://github.com/dart-lang/cli_util