Merge r22905 and r22906

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@23773 3ad0048d-3df7-0310-abae-a5850022a9f2