Merge branch 'master' of https://github.com/joomla/joomla-framework
Merge branch 'master' of https://github.com/joomla/joomla-framework
Merge branch 'master' of https://github.com/joomla/joomla-framework
Merge branch 'master' of https://github.com/joomla/joomla-framework
Code cleaning
Merge branch 'master' of https://github.com/joomla/joomla-framework