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