# HG changeset patch
# User Peter Sanchez <peter@netlandish.com>
# Date 1512754476 28800
#      Fri Dec 08 09:34:36 2017 -0800
# Node ID f719f8304593939d4306173df89fb47e4556cc8e
# Parent  0bb27be9f2a1c525c38784f0922cfcc76b412a69
# Parent  cad3bba54648329d1873136e26d9036b5f687247
Merging in python3 branch