…c 3.0.4 and trunk. #34866,34895

git-svn-id: https://svn.freepascal.org/svn/lazarus/trunk@60125 4005530d-fff6-0310-9dd1-cebe43e6787f