Merges 22828,22829

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