update from original joomla cms

pull request update from original joomla cms