edit file2.txt from trunk PI. may cause conflict.
Merge branch 'master' into pi

Conflicts:
	file2.txt