Revert "Revert "Merge branch 'superdweebie-rand-bugfix'""

This reverts commit b0ae4689135d62555cf9bbe55cdd7dddcd2d8f05 in order to allow
forward-porting fixes to develop.

Conflicts:
	library/Zend/ModuleManager/ModuleEvent.php

src/Adapter/AbstractAdapter.php

@@ -53,6 +53,9 @@ abstract class AbstractAdapter implements AdapterInterface
      */
     public function write($text, $color = null, $bgColor = null)
     {
+        //Encode text to match console encoding
+        $text = $this->encodeText($text);
+
         if ($color !== null || $bgColor !== null) {
             echo $this->colorize($text, $color, $bgColor);
         } else {
@@ -497,4 +500,27 @@ public function readChar($mask = null)
         fclose($f);
         return $char;
     }
+
+    /**
+     * Encode a text to match console encoding
+     *
+     * @param  string $text
+     * @return string the encoding text
+     */
+    public function encodeText($text)
+    {
+        if ($this->isUtf8()) {
+            if (StringUtils::isValidUtf8($text)) {
+                return $text;
+            }
+
+            return utf8_encode($text);
+        }
+
+        if (StringUtils::isValidUtf8($text)) {
+            return utf8_decode($text);
+        }
+
+        return $text;
+    }
 }