Merged trunk changes r522-534 into the delphi2010-port branch.
Development branch to make project compatible with Delphi 2010.
