Sync with maint

* maint: Some fixes for 2.9.3

Junio C Hamano committed Jul 28, 2016 at 14:21 UTC f8f7adce9fc50a11a764d57815602dcb818d1816

No changes.