Sync with master
authorJunio C Hamano <gitster@pobox.com>
Thu, 24 Aug 2017 18:19:59 +0000 (11:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Aug 2017 18:19:59 +0000 (11:19 -0700)
* master:
The fourth batch post 2.14

Trivial merge