Merge branch 'maint-2.8' into maint-2.9

Junio C Hamano committed May 5, 2017 at 13:13 UTC c93ab42b7480a2c317713385f5ef3f8f2b099c2b

No changes.