v3.1: Rebase to v4.12-rc1
diff --git a/base b/base
index 13e09881..2ea659a 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit 13e0988140374123bead1dd27c287354cb95108e
+Subproject commit 2ea659a9ef488125eb46da6eb571de5eae5c43f6
diff --git a/series b/series
index 5debeb0..5289192 160000
--- a/series
+++ b/series
@@ -1 +1 @@
-Subproject commit 5debeb08338b520f52577ca6cf9be815a54c07ea
+Subproject commit 528919215aa06b895c4d05f5f081b9a1d9973cfe