[crux-commits] ports/opt (2.4): Merge branch '2.3' into 2.4