Hand-apply 243a1efdfcf2f1b2883bffbf22579e1e193f5c08 from master; add supporter.