[crux-commits] ports/contrib (3.0): Merge branch '3.0' into 3.1