changes for merging Master to Joomla 3