Merge branch 'master' into WebGUI8

docs/changelog/7.x.x.txt

@@ -2,6 +2,9 @@
  - added #11477: No synopsis in asset now means no synopsis in search index
  - added #11007: Added drag'n'drop sorting in Gallery Album Edit View (Bernd Kalbfuß-Zimmermann)
  - added Better comment rating icons.
+ - fixed #11520: Wiki Locked
+ - fixed Missing Template variables for the Wiki Page view template.
+ - added #10944: Wiki Keyword Page
 
 7.9.2
  - added: Workflow to extend recurring Calendar events 2 years from the

docs/gotcha.txt

@@ -17,9 +17,15 @@ save you many hours of grief.
     - Moose
     - CHI
 
+7.9.3
+--------------------------------------------------------------------
+     * Test:Deep, which had been an optional dependency for testing, has been used
+       in components of the core for a while, since the release of the new Survey.
+       Test::Deep version 0.095 or higher is now required.
+
 7.9.2
 --------------------------------------------------------------------
-     * new dependency: DateTime::Event::ICal
+     * new dependency: DateTime::Event::ICal 0.10 or higher
 
 7.9.0
 --------------------------------------------------------------------