From c7a1d9891ef84580245d64cb3d801f909737b2c4 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gdr@ravenbrook.com>
Date: Tue, 25 Aug 2015 19:28:43 +0100
Subject: [PATCH] Branching master to branch/2015-08-25/tradeoff.

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