Merge branch '25-from-2.15.1' into 26-misc
Merge branch '21-debug' into 26-misc
tweak to avoid out-of-bounds access in sort.c
Merge branch '26-misc' into 28-applydefine