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