From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Mar 2018 23:12:05 +0000 (-0800)
Subject: Sync with master
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d534789076285d319a5ede615f98c24b4ad17c81

Sync with master

* master:
Seventh batch for 2.17
---

d534789076285d319a5ede615f98c24b4ad17c81