master 1.2 test3 commit
Merge branch 'master_1.2'

Conflicts:
	test3