From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Feb 2018 00:43:09 +0000 (-0800)
Subject: Sync with master
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e5215aaa5c9875adf01d63ed4237f0870ec897f1?hp=--cc

Sync with master

* master:
Second batch for 2.17
---

e5215aaa5c9875adf01d63ed4237f0870ec897f1