merge with trunk

git-svn-id: http://svn.freepascal.org/svn/fpc/branches/tg74@28411 3ad0048d-3df7-0310-abae-a5850022a9f2