Merge pull request #2 from joomla/master

Update master