Merge branch 'master' of https://github.com/joomla/joomla-cms
Merge branch 'master' of https://github.com/joomla/joomla-cms
Merge branch 'master' of https://github.com/bcordis/joomla-cms
Merge branch 'master' of https://github.com/bcordis/joomla-cms