Merge branch 'maint-2.6' into maint-2.7

Junio C Hamano committed May 5, 2017 at 12:59 UTC dc58c8554ab9ca8ae12944ce5a311a39d93835eb

No changes.