Merge branch 'master' of https://github.com/rsandrea/zf2 into hotfix/…

…http-user-agent

Conflicts:
	library/Zend/Http/Header/UserAgent.php

src/Header/UserAgent.php

@@ -16,7 +16,7 @@ public static function fromString($headerLine)
         list($name, $value) = preg_split('#: #', $headerLine, 2);
 
         // check to ensure proper header type for this factory
-        if (strtolower($name) !== 'user-agent') {
+        if (str_replace(array('_', ' ', '.'), '-', strtolower($name)) !== 'user-agent') {
             throw new Exception\InvalidArgumentException('Invalid header line for User-Agent string: "' . $name . '"');
         }