Merge remote-tracking branch 'origin/master' into pinch

Conflicts:
	examples/widgets/scale.dart