B3
Merge branch 'B'

Conflicts:
	test