Merge remote-tracking branch 'refs/remotes/origin/master' into next

# Conflicts:
#	wcfsetup/install/files/js/WCF.Combined.min.js
#	wcfsetup/install/files/js/WoltLabSuite.Core.min.js
#	wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Format.js
#	wcfsetup/install/files/lib/system/api/composer.lock
#	wcfsetup/install/files/lib/system/api/erusev/parsedown/README.md

diff --cc wcfsetup/install/files/js/WCF.Message.js
Simple merge

diff --cc wcfsetup/install/files/js/WCF.Poll.js
Simple merge

diff --cc wcfsetup/install/files/js/WCF.User.js
Simple merge

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js
Simple merge

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Code.js
Simple merge

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Format.js
index e2f64f3fba1433d3ef74c150097cada0c20aa3a6,5e8c2bad4d0da2b2cf5b23463ee4db7d3ec89950..123c9cd737fe393b82bd305705995e2ac31f437b
--- 1/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Format.js
--- 2/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Format.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Format.js
@@@ -11,19 -11,19 +11,32 @@@
  define(['Dom/Util'], function(DomUtil) {
        "use strict";
        
 +      if (!COMPILER_TARGET_DEFAULT) {
 +              var Fake = function() {};
 +              Fake.prototype = {
 +                      format: function() {},
 +                      removeFormat: function() {},
 +                      _handleParentNodes: function() {},
 +                      _getLastMatchingParent: function() {},
 +                      _isBoundaryElement: function() {},
 +                      _getSelectionMarker: function() {}
 +              };
 +              return Fake;
 +      }
 +      
+       var _isValidSelection = function(editorElement) {
+               var element = window.getSelection().anchorNode;
+               while (element) {
+                       if (element === editorElement) {
+                               return true;
+                       }
+                       
+                       element = element.parentNode;
+               }
+               
+               return false;
+       };
+       
        /**
         * @exports     WoltLabSuite/Core/Ui/Redactor/Format
         */

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Quote.js
Simple merge

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Spoiler.js
Simple merge

diff --cc wcfsetup/install/files/lib/system/api/composer/installed.json
Simple merge