Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:34:59 +0000 (13:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:34:59 +0000 (13:34 -0800)
* maint:
Ready for 2.11.1

Trivial merge