[crux-commits] ports/core (2.3): Merge branch '2.2' into 2.3