Merge branch 'maint-2.11' into maint

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

No changes.