Merge source code from joomla-platform