Sync with maint
authorJunio C Hamano <redacted>
Thu, 28 Jul 2016 21:21:18 +0000 (14:21 -0700)
committerJunio C Hamano <redacted>
Thu, 28 Jul 2016 21:21:18 +0000 (14:21 -0700)
* maint:
  Some fixes for 2.9.3


Trivial merge
git clone https://git.99rst.org/PROJECT