1
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	TEST/DPR/ProjectTest.dpr
	TEST/DPR/ProjectTest.dproj