From: drlellinger <39723641+drlellinger@users.noreply.github.com>
Date: Thu, 12 Mar 2020 07:03:38 +0000 (+0100)
Subject: Merge pull request #1 from mozilla/master
X-Git-Tag: v1.15~17^2~3
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/7aa7b765f893d5997c9690de2ff054cea26fb93f?ds=sidebyside;hp=--cc

Merge pull request #1 from mozilla/master

Pull changes made in the last few hours
---

7aa7b765f893d5997c9690de2ff054cea26fb93f