[crux-commits] ports/opt (3.4): Merge branch '3.3' into 3.4