Merge branch 'develop' into 'activates-ldap-authentication'

# Conflicts:
#   html/typo3conf/LocalConfiguration.php
2 jobs for activates-ldap-authentication in 5 minutes and 38 seconds (queued for 2 seconds)