Sync with maint

* maint: Hopefully final batch for 2.9.3

Junio C Hamano committed Aug 8, 2016 at 14:52 UTC a0a1831b034af10e5d5b37b99489a7558f9cc547

No changes.