commit in master
Merge branch 'master' into testing

Conflicts:
	foo.txt