Sync with master
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:38:06 +0000 (14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:38:06 +0000 (14:38 -0700)
* master:
Prepare for 2.14.2
The third batch post 2.14

Trivial merge