v3.25.4
9f88f709 · Merge branch 'allow-merge-commits' into 'master' ·