Merge fix for joomla/joomla-platform#1279