Sync with master
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Sep 2017 03:53:13 +0000 (12:53 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Sep 2017 03:53:13 +0000 (12:53 +0900)
* master:
The eighth batch for 2.15

Trivial merge