[crux-commits] ports/compat-32 (3.5): Merge branch '3.4' into 3.5