Bringing our fork upto date with the master version and pulling in fix for kill() error