Merge branch 'master' into twig_new

# Conflicts:
#	extension/Classes/Core/Database/Database.php
3 jobs for twig_new in 2 minutes and 59 seconds (queued for 1 second)