Sync with maint

Junio C Hamano committed Mar 21, 2017 at 15:11 UTC afd6726309f57f532b4b989a75c1392359c611cc

No changes.