v12 1
master 3
v13 1
Merge branch 'v1_stable' into v1_stable_3

Conflicts:
	file1.txt
Merge branch 'v1_stable_2' into v1_stable

Conflicts:
	file1.txt
Merge branch 'v1_stable_3' into v1_stable

Conflicts:
	file1.txt