Make this branch compile with Delphi XE2 again