Sync with maint

This commit is contained in:
Junio C Hamano
2013-06-03 13:00:03 -07:00