Merge branch 'develop' into 'master'

Star Wars Release (Bugfix Release III) 04-05-20

See merge request t3o/typo3.org!364
8 jobs for master in 11 minutes and 1 second (queued for 1 second)