Effect of combined triangularity and ellipticity on the stability limit of the ideal internal kink mode in a tokamak