Doc blocks in the mockers
Merge branch 'staging' of github.com:joomla/joomla-cms into staging