Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:36:38 +0000 (14:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:36:38 +0000 (14:36 -0700)
* maint:
Prepare for 2.14.2

Trivial merge