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

Sync with master

* master:
Fifth batch for 2.17
---

10f1821815e67bd616ad47f6aff574fe42b40b53