Merge branch 'develop' into babolivier/mark_unread

4 files changed, 4 insertions, 0 deletions

diff --git a/changelog.d/7648.bugfix b/changelog.d/7648.bugfix
new file mode 100644

index 0000000000..ff2417bfb6
--- /dev/null
+++ b/changelog.d/7648.bugfix
@@ -0,0 +1 @@
+In working mode, ensure that replicated data has not already been received.
diff --git a/changelog.d/7688.bugfix b/changelog.d/7688.bugfix
new file mode 100644

index 0000000000..2ed718a087
--- /dev/null
+++ b/changelog.d/7688.bugfix
@@ -0,0 +1 @@
+Fix "Starting db txn 'get_completed_ui_auth_stages' from sentinel context" warning. The bug was introduced in 1.13.0rc1.
diff --git a/changelog.d/7689.bugfix b/changelog.d/7689.bugfix
new file mode 100644

index 0000000000..10ad4c8c13
--- /dev/null
+++ b/changelog.d/7689.bugfix
@@ -0,0 +1 @@
+Compare the URI and method during user interactive authentication (instead of the URI twice). Bug introduced in 1.13.0rc1.
diff --git a/changelog.d/7692.misc b/changelog.d/7692.misc
new file mode 100644

index 0000000000..ef6cbe0005
--- /dev/null
+++ b/changelog.d/7692.misc
@@ -0,0 +1 @@
+Replace uses of `six.iterkeys`/`iteritems`/`itervalues` with `keys()`/`items()`/`values()`.