Merge branch '3.0'

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/ColorUtil.js
index 0a0b78db437b6d2bf60bd6460cd4ccf3540d274e,a28fe785af1bdb102f0509a92ae226371e062ffa..6555c8b4b37e8a9080a166c5b7594986bfa49747
--- 1/wcfsetup/install/files/js/WoltLabSuite/Core/ColorUtil.js
--- 2/wcfsetup/install/files/js/WoltLabSuite/Core/ColorUtil.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/ColorUtil.js
@@@ -197,7 -48,7 +197,7 @@@ define([], function () 
                        var charList = "0123456789ABCDEF";
                        
                        if (g === undefined) {
-                               if (r.toString().match(/^rgba?\((\d+), ?(\d+), ?(d\+)(?:, ?[0-9.]+)?\)$/)) {
 -                              if (r.match(/^rgba?\((\d+), ?(\d+), ?(\d+)(?:, ?[0-9.]+)?\)$/)) {
++                              if (r.toString().match(/^rgba?\((\d+), ?(\d+), ?(\d+)(?:, ?[0-9.]+)?\)$/)) {
                                        r = RegExp.$1;
                                        g = RegExp.$2;
                                        b = RegExp.$3;