Merge branch 'master' into 8960redirectAllMailWrapLongList

# Conflicts:
#	extension/Classes/Core/Report/SendMail.php
3 jobs for 8960redirectAllMailWrapLongList in 2 minutes and 35 seconds (queued for 1 minute and 24 seconds)