From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Feb 2018 23:41:32 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2e18187dfdb805eb42926ca430828b89b45f5da7?hp=--cc

Merge branch 'master' into next

* master:
Fourth batch for 2.17
---

2e18187dfdb805eb42926ca430828b89b45f5da7