- pull r15578 from busybox_scratch branch: