Sync with master
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Sep 2017 04:18:12 +0000 (13:18 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Sep 2017 04:18:12 +0000 (13:18 +0900)
* master:
The sixth batch post 2.14

Trivial merge