m-2
m-3
Merge remote-tracking branch 'origin/master' into iss

Conflicts:
	sample.txt