fix typo
Merge branch '24-misc' into 25-from-2.15.1