merged with latest joomla-cms master