Merge pull request #1 from joomla/master

merge