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

…r-471

src/Uri.php

@@ -242,7 +242,7 @@ public function parse($uri)
                 $port = substr($authority, $colonPos + 1);
                 if ($port) {
                     $this->setPort((int) $port);
-                } 
+                }
                 $authority = substr($authority, 0, $colonPos);
             }