Baz!
Merge commit '21a2766' into feature

Conflicts:
	baz
Quux!
Merge branch 'master' into feature
Merge branch 'feature'