Merge branch 'master' into ganesh-branch

Conflicts:
	test-folder/sample-234.txt