Update source code from Joomla

Update source code from Joomla