From d093a4b685f365048ca09ab4e5789b06e887a3cc Mon Sep 17 00:00:00 2001
From: Gareth Rees <gdr@ravenbrook.com>
Date: Tue, 19 Apr 2016 17:23:38 +0100
Subject: [PATCH] Branching master to branch/2016-04-19/job004011.

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