Merge tag 'v2.9.5' into maint-2.10

Git 2.9.5

Junio C Hamano committed Jul 30, 2017 at 14:57 UTC d78f06a1b70f3743899b5494f55a456596e51a63

No changes.