From 8c410013286fc2c73d4964b2b96fc2f06f70099d Mon Sep 17 00:00:00 2001
From: Gareth Rees <gdr@ravenbrook.com>
Date: Wed, 1 Aug 2018 09:47:51 +0100
Subject: [PATCH] Branching master to branch/2018-08-01/rm-mv.

Copied from Perforce
 Change: 194835