Merge tag 'v2.11.3' into maint-2.12

Git 2.11.3

Junio C Hamano committed Jul 30, 2017 at 15:04 UTC 3def5e9a8de16c505d369187ac3ec2ff87ab562a

No changes.