From: Michael Kaply <consulting@kaply.com>
Date: Fri, 23 Mar 2018 20:20:08 +0000 (-0500)
Subject: Merge branch 'master' into 1429177_Proxy
X-Git-Tag: 0.9~28^2~2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/63137e9ff89ff41c41bcdc33589563d037cc9715?ds=inline;hp=63137e9ff89ff41c41bcdc33589563d037cc9715

Merge branch 'master' into 1429177_Proxy
---