Sync with 'master'
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Feb 2018 22:56:55 +0000 (14:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Feb 2018 22:56:55 +0000 (14:56 -0800)
Trivial merge