Merge tag 'v2.12.4' into maint

Junio C Hamano committed Aug 1, 2017 at 12:27 UTC e312af164c12052b7a0dbf8f7b86549a3c5b578f

No changes.