Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:11:38 +0000 (15:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:11:38 +0000 (15:11 -0700)
Trivial merge