commit from master
Merge branch 'master' into newbranch

Conflicts:
	test