Sync with master
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:28:28 +0000 (17:28 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:28:28 +0000 (17:28 +0900)
* master:
The seventh batch post 2.14
RelNotes: further fixes for 2.14.2 from the master front

Trivial merge