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