From f6363779b520a5235ed90fea9eaa33890417d1bc Mon Sep 17 00:00:00 2001
From: Richard Brooksby <rb@ravenbrook.com>
Date: Fri, 8 Apr 2016 17:49:54 +0100
Subject: [PATCH] Branching master to branch/2016-04-08/protidying.

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