From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Aug 2017 17:37:19 +0000 (-0700)
Subject: Sync with master
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/238414bde168866658281957364b80816e9be329?hp=--cc

Sync with master

* master:
The second batch post 2.14
---

238414bde168866658281957364b80816e9be329