Merge remote-tracking branch 'upstream/master' into merging-3.7

Conflicts:
	composer.json
	composer.lock
	index.php
	src/Backend/Modules/Settings/Actions/Index.php
	src/Frontend/Core/Engine/Template.php
	src/Frontend/Modules/FormBuilder/Layout/Templates/Mails/Form.tpl