Merge remote branch 'upstream/develop' into feature/multilingual-phase-ii

Conflicts:
	include/ajax.tickets.php
	include/ajax.users.php
	include/class.dynamic_forms.php
	include/class.email.php
	include/class.misc.php
	include/staff/emails.inc.php
	include/staff/templates/user-register.tmpl.php
	login.php
	setup/inc/install-done.inc.php