v2.2.6 Prep
Merge remote-tracking branch 'origin/master' into feature/donate-form

Conflicts:
	modl_giving_impact/upd.modl_giving_impact.php