Merge branch 'maint'

* maint:
Update draft release notes for 1.5.3.6
Fix per-directory exclude handing for "git add"
core.excludesfile clean-up
Fix t9101 test failure caused by Subversion "auto-props"
git-send-email: add charset header if we add encoded 'From'

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

diff --cc t/t9101-git-svn-props.sh
Simple merge