From d0ba77de474c3abac3e8ad14bda2b2cdbfcf6709 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gdr@ravenbrook.com>
Date: Sat, 25 Oct 2014 11:24:29 +0100
Subject: [PATCH] Branching master to branch/2014-10-25/thread.

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