From 0867fe4dde3eeeb870180f09e98baf794f59da77 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gdr@ravenbrook.com>
Date: Mon, 12 Sep 2016 09:48:55 +0100
Subject: [PATCH] Branching master to branch/2016-09-12/job004020.

Copied from Perforce
 Change: 192275
 ServerID: perforce.ravenbrook.com