From a9ff3dc41192afa82e052a8550725cf74bf13cf2 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gdr@ravenbrook.com>
Date: Wed, 27 Jun 2018 14:53:21 +0100
Subject: [PATCH] Branching master to branch/2018-06-27/job004056.

Copied from Perforce
 Change: 194240