[crux-commits] ports/opt (master): Merge branch 'svn-2.2' into 2.2