test for
dd
Merge branch 'RB_1.0'

Conflicts:
	test.text