Making stuff mergable

Merged these pending PRs:
https://github.com/joomla-projects/joomla-cms/pull/62
https://github.com/joomla-projects/joomla-cms/pull/70
https://github.com/joomla-projects/joomla-cms/pull/72

And merged latest changes of main master.

So should be mergable with joomla/joomla-cms/master now.