Merge branch 'hotfix/ZF-9197' of https://github.com/thomasweidner/zf2 …

…into hotfix/zf-9197

Conflicts:
	library/Zend/Filter/InputFilter.php
	tests/Zend/Filter/InputTest.php

test/MimeTest.php

@@ -37,6 +37,28 @@
  */
 class MimeTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * Stores the original set timezone
+     * @var string
+     */
+    private $_originaltimezone;
+
+    /**
+     * Setup environment
+     */
+    public function setUp()
+    {
+        $this->_originaltimezone = date_default_timezone_get();
+    }
+
+    /**
+     * Teardown environment
+     */
+    public function tearDown()
+    {
+        date_default_timezone_set($this->_originaltimezone);
+    }
+
     public function testBoundary()
     {
         // check boundary for uniqueness