Merge branch 'develop' into '63-activate-realurl'

# Conflicts:
#   html/typo3conf/ext/t3omy/Configuration/TypoScript/main.txt
3 jobs for 63-activate-realurl in 3 minutes and 44 seconds (queued for 3 seconds)