Merge tag 'v2.10.4' into maint-2.11

Git 2.10.4

Junio C Hamano committed Jul 30, 2017 at 15:01 UTC 05bb78abc179b47f6288b990c1ba8f3d403cad1d

No changes.