# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1562536053 -7200
# Node ID ee5d6cf035d9a9cf080f85cb3daa2c5f1110c696
# Parent  272e634cc6eeaec315ea7c2bdea0a98811e9d0c4# Parent  22bc7d3d51bb611f0ffe8e9bd33de931974b4e6b
Merged changes from the default branch.