* Merge with head. Incorporates fix for NM fork bombing, and bw min limits.