Sync with maint

Junio C Hamano committed Apr 21, 2015 at 12:58 UTC fb896362cc12dfc0df69be6c9d75936f9c7cc7ff

No changes.