Merge source code from joomla-cms master