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