Master goes on...
Merge branch 'master' into ad-child

Conflicts:
	Foobar.txt