p1 v1
p1 v2
p3 v1
p1 v3
Merge branch 'path3' into path1

Conflicts:
	README.txt
Merge branch 'path1' into v5x

Conflicts:
	README.txt