Added Delphi XE support
Merge branch 'salvadorbs/master'
Fixes to salvadorbs changes. Note: did not actually test XE compilation myself.