Merge branch '2.4.dev' into 2.5.dev

author Will Budic <redacted>

Tue, 2 May 2023 14:18:27 +0000 (00:18 +1000)

committer Will Budic <redacted>

Tue, 2 May 2023 14:18:27 +0000 (00:18 +1000)
author Will Budic <redacted>
Tue, 2 May 2023 14:18:27 +0000 (00:18 +1000)
committer Will Budic <redacted>
Tue, 2 May 2023 14:18:27 +0000 (00:18 +1000)
diff --cc htdocs/cgi-bin/system/modules/Settings.pm
Simple merge
author	Will Budic <redacted>
	Tue, 2 May 2023 14:18:27 +0000 (00:18 +1000)
committer	Will Budic <redacted>
	Tue, 2 May 2023 14:18:27 +0000 (00:18 +1000)