Merge branch 'master' into next

diff --cc wcfsetup/install/files/lib/system/bbcode/highlighter/CssHighlighter.class.php
index 66adb92eb0d98e099b4835443cd13d46bf567755,a11fd37f9fa37b664f6c6d5b6f53cbb14046e136..eba421b2e52c76df319aa31f52ad1e87a1928db3
--- 1/wcfsetup/install/files/lib/system/bbcode/highlighter/CssHighlighter.class.php
--- 2/wcfsetup/install/files/lib/system/bbcode/highlighter/CssHighlighter.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/highlighter/CssHighlighter.class.php
@@@ -5,26 -5,11 +5,12 @@@ namespace wcf\system\bbcode\highlighter
   * Highlights syntax of cascading style sheets.
   * 
   * @author    Tim Duesterhus
 - * @copyright 2001-2018 WoltLab GmbH
 + * @copyright 2001-2019 WoltLab GmbH
   * @license   GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
   * @package   WoltLabSuite\Core\System\Bbcode\Highlighter
 + * @deprecated        since 5.2, use Prism to highlight your code.
   */
  class CssHighlighter extends Highlighter {
-       /**
-        * temporary string replacement map for properties that can also be tags
-        * @var string[]
-        */
-       public static $duplicates = [
-               'table:' => 't@@able:',
-               'caption:' => 'c@@aption:',
-               'menu:' => 'm@@enu:',
-               'code:' => 'c@@ode:',
-               'sub:' => 's@@ub:',
-               'pre:' => 'p@@re:',
-               'small:' => 's@@mall:'
-       ];
-       
        /**
         * @inheritDoc
         */