From: Michael Kaply <consulting@kaply.com>
Date: Wed, 5 Sep 2018 20:20:38 +0000 (-0700)
Subject: Merge branch 'master' into patch-2
X-Git-Tag: v1.2~8^2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/57ee6c24ee22fb73dac5d20dd607f08881e21efc?hp=57ee6c24ee22fb73dac5d20dd607f08881e21efc

Merge branch 'master' into patch-2
---