From: David Given <dg@cowlark.com>
Date: Fri, 20 Jan 2017 20:29:58 +0000 (+0100)
Subject: Merge from default.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=027a0751caddde993863d6c61a4b8465d324f295;p=ack.git

Merge from default.
---

027a0751caddde993863d6c61a4b8465d324f295