Merge tag 'v2.8.6' into maint-2.9

Git 2.8.6

Junio C Hamano committed Jul 30, 2017 at 14:52 UTC af0178aec7c38cb17bc641bc361656cc90bc6b79

No changes.