Merge branch 'develop' into '80-move-required-static-includes-into-t3org_layout'
# Conflicts: # html/typo3conf/ext/t3org_layout/Configuration/TypoScript/Default/constants.txt
# Conflicts: # html/typo3conf/ext/t3org_layout/Configuration/TypoScript/Default/constants.txt