From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Aug 2017 21:38:06 +0000 (-0700)
Subject: Sync with master
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a6f9c191bfc9a6b63d62cbc930e5c5d55d262226

Sync with master

* master:
Prepare for 2.14.2
The third batch post 2.14
---

a6f9c191bfc9a6b63d62cbc930e5c5d55d262226