Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Feb 2018 23:41:32 +0000 (15:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Feb 2018 23:41:32 +0000 (15:41 -0800)
* master:
Fourth batch for 2.17

No differences found