From: David Given <dg@cowlark.com>
Date: Sun, 30 Oct 2016 14:53:26 +0000 (+0100)
Subject: Merge from default.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Ftravis;p=ack.git

Merge from default.
---

9b6a5e3ae71431ce0dedf74ca5e9dfab5f0cf5b8