Merge commit '21a2766' into feature

Conflicts:
	baz
Quux!