Straight copy from SVN fundraising-misc, r2485 aka "deployment" branch

Change-Id: I3f94a877e760cc7762592d3ee7886cb84be51956
TODO: reimport with history