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