Sync with joomla-cms master