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

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