Merge remote-tracking branch 'origin/master' into target2
Edit text1 in target2.
Edit text2 in target2.
Fixed conflict after pull code from master.