change from 1416
Merge branch 'master' into branch_r1416

Conflicts:
	helloworld.txt