Merge pull request #10571 from totten/master-joomla-hook