Duplicate.
Duplicate Analyzed.
Merge branch 'master' into hotfix

Conflicts:
	File_B.txt