Merge branch 'stable-2.6'

* stable-2.6:
  Fix pushing SHA1:refs/changes/NNNN
  2.6 Release Notes: s/EMail/Email/g