J3.0 Administration: Fatal error in diagnostics page
Merge remote-tracking branch 'origin/master'

Conflicts:
	components/com_kunena/admin/template/joomla25/tools/diagnostics.php