Merge remote-tracking branch 'upstream/master'

Conflicts:
	composer.lock
	web/install/config.php
	web/install/end.php
Merge remote-tracking branch 'upstream/master'

Conflicts:
	composer.lock
	web/install/config.php
	web/install/end.php