Merge branch 'develop' into '80-move-required-static-includes-into-t3org_layout'

# Conflicts:
#   html/typo3conf/ext/t3org_layout/Configuration/TypoScript/Default/constants.txt
4 jobs for 80-move-required-static-includes-into-t3org_layout in 3 minutes and 20 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #5951
build

00:01:53

failed #5945
build

00:01:15

failed #5948
build

00:02:04

 
  Layout
passed #5946
layout

00:01:27