Merged in "stop-by-kill" from latest mflux installer