Merge branch 'master' into audit-update

Author: rachlanders

CODEOWNERS

@@ -1,12 +1,12 @@
 # The default owners for everything in
 # the repo. Unless a later match takes precedence.
-CODEOWNERS  @sanscontext @XavierAgostini @danielstjules @stephment
+CODEOWNERS  @sanscontext @markzegarelli @nielst @XavierAgostini @danielstjules @stephment
 
 # Diagram library
 /diagram-library @sanscontext
 
 # Utility scripts
-/scripts @sanscontext @XavierAgostini
+/scripts @sanscontext @bryanmikaelian @XavierAgostini
 
 
 # Content owners should be in the order of PM, TL (team-lead), and EM (in a crisis) for a given team.
@@ -20,10 +20,8 @@ CODEOWNERS  @sanscontext @XavierAgostini @danielstjules @stephment
 # Libraries owners
 /src/connections/catalog/libraries  @osamakhn @bsneed @lubird @pooyaj @juliofarah
 
-
 # Destination owners
 /src/connections/destinations  @n2parko @danielstjules @benhorowitz
-# temporary removal: @carlosmecha
 
 
 # Privacy owners

Gemfile.lock

@@ -55,7 +55,8 @@ GEM
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.1.0)
+    kramdown (2.3.0)
+      rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
@@ -75,6 +76,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
+    rexml (3.2.4)
     rouge (3.13.0)
     ruby-enum (0.7.2)
       i18n