Merge branch 'master' of https://github.com/qriver/Delphi2010
Merge branch 'master' of https://github.com/qriver/Delphi2010