5 files changed, 51 insertions, 4 deletions
diff --git a/dev/build/windows/makecoq_mingw.sh b/dev/build/windows/makecoq_mingw.sh
index a4e60744f..94e90bf4f 100644
--- a/dev/build/windows/makecoq_mingw.sh
+++ b/dev/build/windows/makecoq_mingw.sh
@@ -1437,12 +1437,16 @@ function make_addon_equations {
 }
 
 function make_addons {
-  if [ -n "${GITLAB_CI}" ]; then
+  if [ -n "$GITLAB_CI" ]; then
     export CI_BRANCH="$CI_COMMIT_REF_NAME"
-    if [[ ${CI_BRANCH#pr-} =~ ^[0-9]*$ ]]
-    then
+    if [[ ${CI_BRANCH#pr-} =~ ^[0-9]*$ ]]; then
       export CI_PULL_REQUEST="${CI_BRANCH#pr-}"
+    else
+      export CI_PULL_REQUEST=""
     fi
+  else
+    export CI_BRANCH=""
+    export CI_PULL_REQUEST=""
   fi
   . /build/ci-basic-overlay.sh
   for overlay in /build/user-overlays/*.sh; do
diff --git a/dev/ci/ci-basic-overlay.sh b/dev/ci/ci-basic-overlay.sh
index 2ebbf2cc4..28321d13e 100755
--- a/dev/ci/ci-basic-overlay.sh
+++ b/dev/ci/ci-basic-overlay.sh
@@ -148,6 +148,12 @@
 : "${bignums_CI_GITURL:=https://github.com/coq/bignums}"
 
 ########################################################################
+# bedrock2
+########################################################################
+: "${bedrock2_CI_BRANCH:=master}"
+: "${bedrock2_CI_GITURL:=https://github.com/mit-plv/bedrock2}"
+
+########################################################################
 # Equations
 ########################################################################
 : "${Equations_CI_BRANCH:=master}"
diff --git a/dev/ci/ci-bedrock2.sh b/dev/ci/ci-bedrock2.sh
new file mode 100755
index 000000000..447076e09
--- /dev/null
+++ b/dev/ci/ci-bedrock2.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+ci_dir="$(dirname "$0")"
+. "${ci_dir}/ci-common.sh"
+
+bedrock2_CI_DIR="${CI_BUILD_DIR}/bedrock2"
+
+git_checkout "${bedrock2_CI_BRANCH}" "${bedrock2_CI_GITURL}" "${bedrock2_CI_DIR}"
+( cd "${bedrock2_CI_DIR}" && git submodule update --init --recursive )
+
+( cd "${bedrock2_CI_DIR}" && make )
diff --git a/dev/doc/critical-bugs b/dev/doc/critical-bugs
index 293b01f63..6166d24b7 100644
--- a/dev/doc/critical-bugs
+++ b/dev/doc/critical-bugs
@@ -81,6 +81,20 @@ Module system
   GH issue number: #4294
   risk: ?
 
+Module system
+
+  component: modules, universes
+  summary: universe constraints for module subtyping not stored in vo files
+  introduced: presumably 8.2 (b3d3b56)
+  impacted released versions: 8.2, 8.3, 8.4
+  impacted development branches: v8.5
+  impacted coqchk versions: none
+  fixed in: v8.2 (c1d9889), v8.3 (8056d02), v8.4 (a07deb4), trunk (0cd0a3e) Mar 5, 2014, Tassi
+  found by: Tassi by running coqchk on the mathematical components library
+  exploit: requires multiple files, no test provided
+  GH issue number: #3243
+  risk: could be exploited by mistake
+
 Universes
 
   component: template polymorphism
@@ -123,6 +137,18 @@ Primitive projections
 
 Conversion machines
 
+  component: "lazy machine" (lazy krivine abstract machine)
+  summary: the invariant justifying some optimization was wrong for some combination of sharing side effects
+  introduced: prior to V7.0
+  impacted released versions: V8.0-V8.0pl4, V8.1-V8.1pl3
+  impacted development branches: none
+  impacted coqchk versions: (eefe63d52, Barras, 20 May 2008), was in beta-development for 8.2 at this time
+  fixed in: master/trunk/8.2 (f13aaec57/a8b034513, 15 May 2008, Barras), v8.1 (e7611477a, 15 May 2008, Barras), v8.0 (6ed40a8bc, 29 Nov 2016, Herbelin, backport)
+  found by: Gonthier
+  exploit: by Gonthier
+  GH issue number: none
+  risk: unrealistic to be exploited by chance
+
   component: "virtual machine" (compilation to bytecode ran by a C-interpreter)
   summary: collision between constructors when more than 256 constructors in a type
   introduced: V8.1
diff --git a/dev/top_printers.ml b/dev/top_printers.ml
index 811abd67f..ab679a71c 100644
--- a/dev/top_printers.ml
+++ b/dev/top_printers.ml
@@ -232,7 +232,7 @@ let ppenv e = pp
 let ppenvwithcst e = pp
   (str "[" ++ pr_named_context_of e Evd.empty ++ str "]" ++ spc() ++
    str "[" ++ pr_rel_context e Evd.empty (rel_context e) ++ str "]" ++ spc() ++
-   str "{" ++ Cmap_env.fold (fun a _ s -> Constant.print a ++ spc () ++ s) (Obj.magic e).env_globals.env_constants (mt ()) ++ str "}")
+   str "{" ++ Environ.fold_constants (fun a _ s -> Constant.print a ++ spc () ++ s) e (mt ()) ++ str "}")
 
 let pptac = (fun x -> pp(Ltac_plugin.Pptactic.pr_glob_tactic (Global.env()) x))