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