Merge branch 'maint-2.7' into maint-2.8

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

No changes.