Merge branch '4.1.x'

Closes gh-1682

Author: snicoll

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
             toolchain: false
           - version: 21
             toolchain: true
-          - version: 24
+          - version: 25
             toolchain: true
         exclude:
           - os: