From: Kirk <bytesized@users.noreply.github.com>
Date: Tue, 21 Aug 2018 16:35:05 +0000 (-0700)
Subject: Merge branch 'master' into patch-1
X-Git-Tag: v1.2~22^2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/226de696757b5f6239fd3a74a79ed32c3add4fde?hp=226de696757b5f6239fd3a74a79ed32c3add4fde

Merge branch 'master' into patch-1
---