# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1507907876 -3600
# Node ID 9a6c27f6d13dd6ea5e5b74e605c29b5e5bd24f62
# Parent  c2460aa9b4eb6fabc5c55962f22ad631454596b9# Parent  f176aa95c5234dcc3a8d8330c566440578c6fcf4
Merge with upstream.

diff -r c2460aa9b4eb -r 9a6c27f6d13d .hgtags
--- a/.hgtags	Fri Oct 13 16:14:05 2017 +0100
+++ b/.hgtags	Fri Oct 13 16:17:56 2017 +0100
@@ -118,3 +118,4 @@
 83bffde974c0ab7c9b831faf2377122593e2a699 build-default-283
 69a7499817c8a3b0f768cb63912f3f66ff98b4e2 build-default-284
 5c1a240cc0fc2a41fe2118ca53364cb45a6d3d29 build-default-285
+34c7947b454284c14562e7a335c4c2a015e7956c build-default-286