Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 19:38:02 +0000 (12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 19:38:02 +0000 (12:38 -0700)
* maint:
Yet another batch for 2.9.3

Trivial merge