Merge https://github.com/joomla/joomla-cms/commit/9aa14cfa34731d3b6a70d3f50bf7293e109206e5