Sync with master
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Aug 2017 17:37:19 +0000 (10:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Aug 2017 17:37:19 +0000 (10:37 -0700)
* master:
The second batch post 2.14

Trivial merge