Conflicts:
	WHATSNEW.md
	include/class.dynamic_forms.php
	include/class.forms.php
	include/class.thread.php
	include/i18n/en_US/help/tips/settings.email.yaml
	include/staff/tickets.inc.php
	scp/tickets.php