Sync with maint

* maint: Yet another batch for 2.9.3

Junio C Hamano committed Aug 10, 2016 at 12:38 UTC a42d7b6a5b5addcce01f483547ad96825c7a96e0

No changes.