[crux-commits] ports/core (3.7): Merge branch '3.6' into 3.7