ok
Merge branch 'origin/master'

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