Merge branch 'v21.05.x'

author Dan Brown <redacted>

Wed, 4 Aug 2021 20:32:29 +0000 (21:32 +0100)

committer Dan Brown <redacted>

Wed, 4 Aug 2021 20:32:29 +0000 (21:32 +0100)
author Dan Brown <redacted>
Wed, 4 Aug 2021 20:32:29 +0000 (21:32 +0100)
committer Dan Brown <redacted>
Wed, 4 Aug 2021 20:32:29 +0000 (21:32 +0100)
diff --cc composer.lock
Simple merge
diff --cc tests/User/UserProfileTest.php
Simple merge
author	Dan Brown <redacted>
	Wed, 4 Aug 2021 20:32:29 +0000 (21:32 +0100)
committer	Dan Brown <redacted>
	Wed, 4 Aug 2021 20:32:29 +0000 (21:32 +0100)
		1	2
composer.lock	patch \|	diff1 \|	diff2 \|	blob \| history
tests/User/UserProfileTest.php	patch \|	diff1 \|	diff2 \|	blob \| history