Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Jul 2017 22:13:25 +0000 (15:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Jul 2017 22:13:25 +0000 (15:13 -0700)
* maint:
fixes from 'master' for 2.13.4

Trivial merge