From bdeaaad453c9c9ef3857eb8da2f06f487cc4df95 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gdr@ravenbrook.com>
Date: Sat, 4 Mar 2017 13:51:17 +0000
Subject: [PATCH] Branching master to branch/2017-03-04/seg-methods.

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