Sync to joomla/joomla-platform@5fbac7b17824b735502355b576bb6ee7524cc9bd (Ref #22)