Sync with maint
commit39566494226919aa18951f2abff6491f5547d377
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:36:38 +0000 (23 14:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:36:38 +0000 (23 14:36 -0700)
treedc4214e255115e96c5ec477f035d99da8a4d9bbd
parentab86f93d680618f62ad6e3c2f37db76029cfce5e
parentedc74bc7f0c6884027e851ef09b2e0c9380dcd45
Sync with maint

* maint:
  Prepare for 2.14.2