[crux-commits] ports/opt (3.2): Merge remote-tracking branch 'origin/3.1' into 3.2