ttstrs
Merge remote-tracking branch 'remotes/origin/develop' into develop

Conflicts:
	sample3.txt