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