From: Michael Kaply <consulting@kaply.com>
Date: Mon, 26 Mar 2018 15:06:21 +0000 (-0500)
Subject: Merge branch 'master' into 1429177_Proxy
X-Git-Tag: 0.9~29^2~1
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/09d0c00368d0f04e164027991f6ee75fc891e58b?hp=09d0c00368d0f04e164027991f6ee75fc891e58b

Merge branch 'master' into 1429177_Proxy
---