From: Michael Kaply <consulting@kaply.com>
Date: Tue, 27 Mar 2018 16:05:46 +0000 (-0500)
Subject: Merge branch 'master' into 1429177_Proxy
X-Git-Tag: 0.9~28^2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/2b52e782571fede63f28c27bd7e2a29684623902?hp=2b52e782571fede63f28c27bd7e2a29684623902

Merge branch 'master' into 1429177_Proxy
---