Merge remote branch 'upstream/develop' into develop-next

Conflicts:
	include/class.dept.php
	include/class.dynamic_forms.php
	include/class.format.php
	include/class.mailfetch.php
	include/class.staff.php
	include/class.thread.php
	include/class.user.php
	include/client/profile.inc.php
	include/staff/directory.inc.php
	include/staff/staffmembers.inc.php
	include/staff/tickets.inc.php