Merge branch '2.1'

diff --cc wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
index ba78d0f61eef11cdc7ef73c30bccd9d32f4a2039,6994d6ebe14bcb0f61217b6744bbbd864d5e78b9..51b55802905ff5814e2e0a3100450a8b3254ac05
--- 1/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
--- 2/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
+++ b/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php
@@@ -183,12 -185,12 +183,12 @@@ class ImagickImageAdapter implements II
        }
        
        /**
 -       * @see \wcf\system\image\adapter\IImageAdapter::drawText()
 +       * @inheritDoc
         */
 -      public function drawText($text, $x, $y, $font, $size, $opacity = 1) {
 +      public function drawText($text, $x, $y, $font, $size, $opacity = 1.0) {
                $draw = new \ImagickDraw();
-               $draw->setFillOpacity($opacity);
                $draw->setFillColor($this->color);
+               $draw->setFillOpacity($opacity);
                $draw->setTextAntialias(true);
                $draw->setFont($font);
                $draw->setFontSize($size);