Sync with maint

Junio C Hamano committed Jun 4, 2017 at 10:29 UTC f4ba3cf615dba8b085795400c2e306782d812b32

No changes.