[TASK] Merge changes from 4.5 upstream to master
drwxr-xr-x - typo3