Merged revisions 1153 via svnmerge from
http://svn.freepascal.org/svn/fpc/trunk

git-svn-id: branches/fixes_2_0@1155 -