Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Jul 2017 20:52:53 +0000 (13:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Jul 2017 20:52:53 +0000 (13:52 -0700)
* maint:
Preparation for 2.13.4 continues

Trivial merge