Sync with maint

Junio C Hamano committed Jun 25, 2014 at 12:32 UTC c47372d3a8a9fb7892cc1aa5cc5df7b6c1e61751

No changes.