Boilerplate corrections
Merge remote-tracking branch 'upstream/master'

Conflicts:
	example/steps/steps1.dart