Sync with 2.16.2
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Feb 2018 23:24:55 +0000 (15:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Feb 2018 23:24:55 +0000 (15:24 -0800)
* tag 'v2.16.2':
Git 2.16.2

Trivial merge