Merge branch 'fc/send-email-envelope'

diff --cc Documentation/git-send-email.txt
Simple merge

diff --cc git-send-email.perl
Simple merge

diff --cc t/t9001-send-email.sh
Simple merge