Cleanup
Merge branch 'staging' of github.com:joomla/joomla-framework into staging