# HG changeset patch
# User smith@nwoca.org
# Date 1476315933 -3600
# Node ID f6d96413673a5178ca8cea94ba085f1a50cc3550
# Parent  da49fcb26e2d9d67df2224671ecf9f4c5b03308c# Parent  120fc16ea5113573722c83a4e3262347d80a80cd
USASR-2388: merge