Merge branch 'master' of vcs.fsf.org:fsf-giving-guide