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)
commite2d9c46130247dd31d0421d2b2fc4bfd014c085e
treeff527904a758666524d235535f021d18de11be17
parent483709ab4dced5710c600a98b1222ca174d53daa
parentc94ef190411ca35f2445ff63488458650faa5d8b
Sync with maint

* maint:
  Preparation for 2.13.4 continues