Andy Wilkinson f2ddf1c082 Merge branch '3.1.x' into 3.2.x ...

While the bug fixed in 3.1.x (gh-39942) has already been addressed as
a side-effect of the changes made in dbb24286, the change is merged
forwards here to improve the consistency of the code between branches.

2024-03-15 15:42:47 +00:00

..

src

Merge branch '3.1.x' into 3.2.x

2024-03-15 15:42:47 +00:00

build.gradle

Merge branch '3.1.x'

2023-12-05 11:51:03 +01:00