Merge branch 'joomla/staging' into 'patch-7'