Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:52:17 +0000 (14:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:52:17 +0000 (14:52 -0700)
commita0a1831b034af10e5d5b37b99489a7558f9cc547
treeb4b701ffd754f2c4c9c209f8073f061958bea234
parent0aaf2500f1302ebbd871b095003043b6c8e2999f
parent00f27feb6afaa9e5f91a0852a5a20c041ba0a421
Sync with maint

* maint:
  Hopefully final batch for 2.9.3