From f14358724a1487e847d1f691f8f2dbaffe092bde Mon Sep 17 00:00:00 2001
From: Gareth Rees <gdr@ravenbrook.com>
Date: Sat, 12 Mar 2016 18:46:24 +0000
Subject: [PATCH] Branching master to branch/2016-03-12/pause.

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