Rerolling pr for #2710
Merge pull request #2740 from openscholar/2710-mailchimp_forms-2

Rerolling pr for #2710