Cholera outbreak: Death toll rises to 31, with all but 2 fatalities in Gauteng