[crux-commits] ports/contrib (3.1): Merged with 3.0