Hand-apply c8926dcc6cb327ddf4796bf2bfe17d65c75940e5 from master; add supporter.