Sync with 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Mar 2017 21:14:24 +0000 (14:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Mar 2017 21:14:24 +0000 (14:14 -0700)
Trivial merge