commit1(v1.2.0)
commit2(v1.2.0)
Merge branch 'v1.2.0'

Conflicts:
	v1.0.0.php