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)
* maint:
Hopefully final batch for 2.9.3

Trivial merge