Sync with maint
commita42d7b6a5b5addcce01f483547ad96825c7a96e0
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 19:38:02 +0000 (10 12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 19:38:02 +0000 (10 12:38 -0700)
tree2048ee0c78b82af8cf3178a769717bfa7a965fa0
parent27b0ea4038f5976bee9d183ccbc868e9fcd9825e
parent8e4b75a97beaf88aa83ab2b18c07bd8ae4954f28
Sync with maint

* maint:
  Yet another batch for 2.9.3