Sync with master
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Aug 2017 06:01:41 +0000 (23:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Aug 2017 06:01:41 +0000 (23:01 -0700)
* master:
The fifth batch post 2.14

Trivial merge