[ofbiz-site] branch master updated: Improved: Change website according to the new ASF data privacy policy (OFBIZ-12610)

[mbrohl]

This is an automated email from the ASF dual-hosted git repository.

mbrohl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-site.git


The following commit(s) were added to refs/heads/master by this push:
     new e9a9469  Improved: Change website according to the new ASF data 
privacy policy (OFBIZ-12610)
e9a9469 is described below

commit e9a94694558f57028b5b8d950e30c1540185a23e
Author: Michael Brohl <michael.br...@ecomify.de>
AuthorDate: Tue May 3 22:07:23 2022 +0200

    Improved: Change website according to the new ASF data privacy policy 
(OFBIZ-12610)
    
    * adds a link to the official privacy policy
    * removes Google analytics tracking code
    * adds Matomo tracking code
---
 404.html                        | 26 +++++++++++++-------
 about-ofbiz.html                | 26 +++++++++++++-------
 business-users.html             | 26 +++++++++++++-------
 developers.html                 | 26 +++++++++++++-------
 download.html                   | 26 +++++++++++++-------
 faqs.html                       | 26 +++++++++++++-------
 getting-involved.html           | 26 +++++++++++++-------
 index.html                      | 26 +++++++++++++-------
 mailing-lists.html              | 26 +++++++++++++-------
 ofbiz-demos.html                | 54 +++++++++++++++++++++++------------------
 release-notes-12.04.06.html     | 26 +++++++++++++-------
 release-notes-13.07.01.html     | 26 +++++++++++++-------
 release-notes-13.07.02.html     | 26 +++++++++++++-------
 release-notes-13.07.03.html     | 26 +++++++++++++-------
 release-notes-16.11.01.html     | 26 +++++++++++++-------
 release-notes-16.11.02.html     | 26 +++++++++++++-------
 release-notes-16.11.03.html     | 26 +++++++++++++-------
 release-notes-16.11.04.html     | 26 +++++++++++++-------
 release-notes-16.11.05.html     | 26 +++++++++++++-------
 release-notes-16.11.06.html     | 26 +++++++++++++-------
 release-notes-16.11.07.html     | 26 +++++++++++++-------
 release-notes-17.12.01.html     | 26 +++++++++++++-------
 release-notes-17.12.03.html     | 26 +++++++++++++-------
 release-notes-17.12.04.html     | 26 +++++++++++++-------
 release-notes-17.12.05.html     | 26 +++++++++++++-------
 release-notes-17.12.06.html     | 26 +++++++++++++-------
 release-notes-17.12.07.html     | 26 +++++++++++++-------
 release-notes-17.12.08.html     | 26 +++++++++++++-------
 release-notes-17.12.09.html     | 26 +++++++++++++-------
 release-notes-18.12.01.html     | 26 +++++++++++++-------
 release-notes-18.12.02.html     | 26 +++++++++++++-------
 release-notes-18.12.03.html     | 26 +++++++++++++-------
 release-notes-18.12.04.html     | 26 +++++++++++++-------
 release-notes-18.12.05.html     | 26 +++++++++++++-------
 security.html                   | 26 +++++++++++++-------
 service-providers.html          | 26 +++++++++++++-------
 source-repositories.html        | 26 +++++++++++++-------
 template/region/footer.tpl.php  |  1 +
 template/region/scripts.tpl.php | 25 ++++++++++++-------
 user-stories.html               | 26 +++++++++++++-------
 40 files changed, 677 insertions(+), 365 deletions(-)

diff --git a/404.html b/404.html
index 92f744b..d84d654 100644
--- a/404.html
+++ b/404.html
@@ -189,6 +189,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -232,16 +233,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/about-ofbiz.html b/about-ofbiz.html
index e9e5331..e4551f6 100644
--- a/about-ofbiz.html
+++ b/about-ofbiz.html
@@ -224,6 +224,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -267,16 +268,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/business-users.html b/business-users.html
index 96ee113..f78c48a 100644
--- a/business-users.html
+++ b/business-users.html
@@ -374,6 +374,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -417,16 +418,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/developers.html b/developers.html
index 037f9da..0a20298 100644
--- a/developers.html
+++ b/developers.html
@@ -350,6 +350,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -393,16 +394,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/download.html b/download.html
index 85954da..ebcb9e7 100644
--- a/download.html
+++ b/download.html
@@ -354,6 +354,7 @@ available <a href="security.html">here</a></p>
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -397,16 +398,23 @@ available <a href="security.html">here</a></p>
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/faqs.html b/faqs.html
index e4844ca..8f813ea 100644
--- a/faqs.html
+++ b/faqs.html
@@ -231,6 +231,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -274,16 +275,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/getting-involved.html b/getting-involved.html
index 61bea71..ecccd3e 100644
--- a/getting-involved.html
+++ b/getting-involved.html
@@ -282,6 +282,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -325,16 +326,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/index.html b/index.html
index 2f96d52..ee34cc3 100644
--- a/index.html
+++ b/index.html
@@ -384,6 +384,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -427,16 +428,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/mailing-lists.html b/mailing-lists.html
index e330b03..4bbe29a 100644
--- a/mailing-lists.html
+++ b/mailing-lists.html
@@ -276,6 +276,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -319,16 +320,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/ofbiz-demos.html b/ofbiz-demos.html
index 2e06327..ca0ea9e 100644
--- a/ofbiz-demos.html
+++ b/ofbiz-demos.html
@@ -82,7 +82,7 @@
             </li>
             <li><a href="#" class="firstLevel">Community</a>
               <ul>
-                <li><a href="getting-involved.html">Getting Involved</a></li>
+                <li><a href="getting-involved.html">Getting Involved</a></li>  
              
                 <li><a href="mailing-lists.html">Mailing Lists</a></li>
                 <li><a href="source-repositories.html">Source 
Repository</a></li>
                 <li><a href="download.html">Downloads</a></li>
@@ -91,18 +91,18 @@
               </ul>
             </li>
             <li><a href="ofbiz-demos.html" class="firstLevel 
active">Demos</a></li>
-          <li>
-            <a href="//twitter.com/ApacheOfbiz" class="icon-twitter-bird 
socialIcon tips"
-              target="external" title="follow us on 
Twitter"><span>twitter</span></a>
-          </li>
-          <li><a href="//www.linkedin.com/company/apache-ofbiz/" 
target="external"  class="icon-linkedin socialIcon tips"  title="follow us on 
Linkedin"><span>linkedin</span></a></li>
-          <li><a 
href="//www.facebook.com/Apache-OFBiz-1478219232210477/?ref=page_internal" 
target="external" class="icon-facebook socialIcon tips"  title="follow us on 
Facebook"><span>facebook</span></a></li>
-          <li><a href="//www.youtube.com/user/ofbiz" class="icon-play 
socialIcon tips" target="external" title="follow us on 
Youtube"><span>Youtube</span></a></li>
-          <!--<li><a href="#" class="icon-rss socialIcon tips"  title="Our rss 
feed"><span>rss feed</span></a></li>
-          <li><a href="#" class="icon-gplus socialIcon tips"  title="follow us 
on Google +"><span>google +</span></a></li>
-          <li><a href="#" class="icon-instagram socialIcon tips"  
title="follow us on Instagram"><span>instagram</span></a></li>
-          <li><a href="#" class="icon-linkedin socialIcon tips"  title="follow 
us on Linkedin"><span>linkedin</span></a></li>
-          <li><a href="#" class="icon-pinterest-circled socialIcon tips"  
title="follow us on Pinterest"><span>Pinterest</span></a></li>-->
+                 <li>
+                   <a href="//twitter.com/ApacheOfbiz" 
class="icon-twitter-bird socialIcon tips"
+                     target="external" title="follow us on 
Twitter"><span>twitter</span></a>
+                 </li>
+                 <li><a href="//www.linkedin.com/company/apache-ofbiz/" 
target="external"  class="icon-linkedin socialIcon tips"  title="follow us on 
Linkedin"><span>linkedin</span></a></li>
+                 <li><a 
href="//www.facebook.com/Apache-OFBiz-1478219232210477/?ref=page_internal" 
target="external" class="icon-facebook socialIcon tips"  title="follow us on 
Facebook"><span>facebook</span></a></li>
+                 <li><a href="//www.youtube.com/user/ofbiz" class="icon-play 
socialIcon tips" target="external" title="follow us on 
Youtube"><span>Youtube</span></a></li>
+                 <!--<li><a href="#" class="icon-rss socialIcon tips"  
title="Our rss feed"><span>rss feed</span></a></li>         
+                 <li><a href="#" class="icon-gplus socialIcon tips"  
title="follow us on Google +"><span>google +</span></a></li>
+                 <li><a href="#" class="icon-instagram socialIcon tips"  
title="follow us on Instagram"><span>instagram</span></a></li>
+                 <li><a href="#" class="icon-linkedin socialIcon tips"  
title="follow us on Linkedin"><span>linkedin</span></a></li>
+                 <li><a href="#" class="icon-pinterest-circled socialIcon 
tips"  title="follow us on Pinterest"><span>Pinterest</span></a></li>-->
           </ul>
         </nav>
       </div>
@@ -250,9 +250,10 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
-                and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
+                       and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
           </li>
           <li><a href="https://www.apache.org/foundation/thanks.html"; 
target="external">Thanks</a></li>
           <li><a 
href="https://ofbiz.apache.org/security.html";>Security</a></li>
@@ -293,16 +294,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-12.04.06.html b/release-notes-12.04.06.html
index c86d2b6..ffaa41f 100644
--- a/release-notes-12.04.06.html
+++ b/release-notes-12.04.06.html
@@ -391,6 +391,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -434,16 +435,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-13.07.01.html b/release-notes-13.07.01.html
index 0143295..f1b816a 100644
--- a/release-notes-13.07.01.html
+++ b/release-notes-13.07.01.html
@@ -267,6 +267,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -310,16 +311,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-13.07.02.html b/release-notes-13.07.02.html
index 879a7ce..f0451c0 100644
--- a/release-notes-13.07.02.html
+++ b/release-notes-13.07.02.html
@@ -336,6 +336,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -379,16 +380,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-13.07.03.html b/release-notes-13.07.03.html
index fec5a10..270c4ad 100644
--- a/release-notes-13.07.03.html
+++ b/release-notes-13.07.03.html
@@ -299,6 +299,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -342,16 +343,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-16.11.01.html b/release-notes-16.11.01.html
index 6c628bf..18f3f04 100644
--- a/release-notes-16.11.01.html
+++ b/release-notes-16.11.01.html
@@ -2094,6 +2094,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -2137,16 +2138,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-16.11.02.html b/release-notes-16.11.02.html
index 5ad0412..f22d5a8 100644
--- a/release-notes-16.11.02.html
+++ b/release-notes-16.11.02.html
@@ -245,6 +245,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -288,16 +289,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-16.11.03.html b/release-notes-16.11.03.html
index 5b2af4b..7e6303f 100644
--- a/release-notes-16.11.03.html
+++ b/release-notes-16.11.03.html
@@ -209,6 +209,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -252,16 +253,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-16.11.04.html b/release-notes-16.11.04.html
index 6b40fd8..7ccf758 100644
--- a/release-notes-16.11.04.html
+++ b/release-notes-16.11.04.html
@@ -271,6 +271,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -314,16 +315,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-16.11.05.html b/release-notes-16.11.05.html
index 4b621ef..c78f669 100644
--- a/release-notes-16.11.05.html
+++ b/release-notes-16.11.05.html
@@ -263,6 +263,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -306,16 +307,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-16.11.06.html b/release-notes-16.11.06.html
index 8b38cc5..4dbee92 100644
--- a/release-notes-16.11.06.html
+++ b/release-notes-16.11.06.html
@@ -427,6 +427,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -470,16 +471,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-16.11.07.html b/release-notes-16.11.07.html
index 6d36628..122e92e 100644
--- a/release-notes-16.11.07.html
+++ b/release-notes-16.11.07.html
@@ -239,6 +239,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -282,16 +283,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-17.12.01.html b/release-notes-17.12.01.html
index 1d25f4a..198f84f 100644
--- a/release-notes-17.12.01.html
+++ b/release-notes-17.12.01.html
@@ -2051,6 +2051,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -2094,16 +2095,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-17.12.03.html b/release-notes-17.12.03.html
index ebc0819..f41765c 100644
--- a/release-notes-17.12.03.html
+++ b/release-notes-17.12.03.html
@@ -235,6 +235,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -278,16 +279,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-17.12.04.html b/release-notes-17.12.04.html
index 3661dcc..d90b420 100644
--- a/release-notes-17.12.04.html
+++ b/release-notes-17.12.04.html
@@ -279,6 +279,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -322,16 +323,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-17.12.05.html b/release-notes-17.12.05.html
index 71860d9..820ff32 100644
--- a/release-notes-17.12.05.html
+++ b/release-notes-17.12.05.html
@@ -313,6 +313,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -356,16 +357,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-17.12.06.html b/release-notes-17.12.06.html
index 221f19d..9ba97fb 100644
--- a/release-notes-17.12.06.html
+++ b/release-notes-17.12.06.html
@@ -231,6 +231,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -274,16 +275,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-17.12.07.html b/release-notes-17.12.07.html
index 2ca1888..f26bee4 100644
--- a/release-notes-17.12.07.html
+++ b/release-notes-17.12.07.html
@@ -218,6 +218,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -261,16 +262,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-17.12.08.html b/release-notes-17.12.08.html
index 1b7ec40..be82535 100644
--- a/release-notes-17.12.08.html
+++ b/release-notes-17.12.08.html
@@ -188,6 +188,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -231,16 +232,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-17.12.09.html b/release-notes-17.12.09.html
index 025a1a7..7b07931 100644
--- a/release-notes-17.12.09.html
+++ b/release-notes-17.12.09.html
@@ -188,6 +188,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -231,16 +232,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-18.12.01.html b/release-notes-18.12.01.html
index 57eba9a..477cbbb 100644
--- a/release-notes-18.12.01.html
+++ b/release-notes-18.12.01.html
@@ -1395,6 +1395,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -1438,16 +1439,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-18.12.02.html b/release-notes-18.12.02.html
index 7911c5c..bbeb1a9 100644
--- a/release-notes-18.12.02.html
+++ b/release-notes-18.12.02.html
@@ -204,6 +204,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -247,16 +248,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-18.12.03.html b/release-notes-18.12.03.html
index 4500e01..d6f3daa 100644
--- a/release-notes-18.12.03.html
+++ b/release-notes-18.12.03.html
@@ -199,6 +199,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -242,16 +243,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-18.12.04.html b/release-notes-18.12.04.html
index 08da78f..c7d8bd9 100644
--- a/release-notes-18.12.04.html
+++ b/release-notes-18.12.04.html
@@ -203,6 +203,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -246,16 +247,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/release-notes-18.12.05.html b/release-notes-18.12.05.html
index 8ed7f28..6e031ec 100644
--- a/release-notes-18.12.05.html
+++ b/release-notes-18.12.05.html
@@ -215,6 +215,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -258,16 +259,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/security.html b/security.html
index f5712a7..54ccf86 100644
--- a/security.html
+++ b/security.html
@@ -235,6 +235,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -278,16 +279,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/service-providers.html b/service-providers.html
index e416516..1bffeb4 100644
--- a/service-providers.html
+++ b/service-providers.html
@@ -356,6 +356,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -399,16 +400,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/source-repositories.html b/source-repositories.html
index c3cdc77..e1ab1e4 100644
--- a/source-repositories.html
+++ b/source-repositories.html
@@ -271,6 +271,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -314,16 +315,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>
diff --git a/template/region/footer.tpl.php b/template/region/footer.tpl.php
index 7e1c116..dead6d0 100644
--- a/template/region/footer.tpl.php
+++ b/template/region/footer.tpl.php
@@ -54,6 +54,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
diff --git a/template/region/scripts.tpl.php b/template/region/scripts.tpl.php
index fe5ec94..6445cb3 100644
--- a/template/region/scripts.tpl.php
+++ b/template/region/scripts.tpl.php
@@ -18,14 +18,21 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
diff --git a/user-stories.html b/user-stories.html
index 603529d..6206443 100644
--- a/user-stories.html
+++ b/user-stories.html
@@ -233,6 +233,7 @@
         <div class="divider"><span></span></div>
         <ul>
           <li><a href="https://www.apache.org/foundation/"; 
target="external">Apache Software Foundation</a></li>
+          <li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html"; 
target="external">Privacy Policy</a></li>
           <li><a href="https://www.apache.org/events/current-event"; 
target="external">Events</a></li>
           <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
target="external">Sponsorship</a>
                        and <a 
href="https://www.apache.org/foundation/contributing.html"; 
target="external">Donations</a>
@@ -276,16 +277,23 @@
 <script type="text/javascript" 
src="js/plugins/rs-plugin/js/jquery.themepunch.revolution.min.js"></script>
 <!-- Custom  -->
 <script type="text/javascript" src="js/custom.js"></script>
+<!-- Matomo -->
 <script type="text/javascript">
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', UA]);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
-    })();
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+  /* We explicitly disable cookie tracking to avoid privacy issues */
+  _paq.push(['disableCookies']);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://analytics.apache.org/";;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '21']);
+    var d=document, g=d.createElement('script'), 
s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Matomo Code -->
 </body>
 </html>