Merge branch 'master' into testing

Conflicts:
	recipes/pubspec.lock
Merge branch 'testing' of https://github.com/dart-lang/cookbook into testing