Merge branch 'master' of git://github.com/zendframework/zf2 into feat…

…ure/view-helper-nav-escapeLabel

test/Header/SubjectTest.php

@@ -27,7 +27,7 @@ public function testHeaderFolding()
         $subject->setSubject($string);
 
         $expected = wordwrap($string, 78, "\r\n ");
-        $test     = $subject->getFieldValue();
+        $test     = $subject->getFieldValue(Header\HeaderInterface::FORMAT_ENCODED);
         $this->assertEquals($expected, $test);
     }
 }