Merge branch 'hotfix/291'

Close #291

Author: weierophinney

src/ServerRequestFactory.php

@@ -244,9 +244,7 @@ public static function marshalUriFromServer(array $server, array $headers)
         ) {
             $scheme = 'https';
         }
-        if (! empty($scheme)) {
-            $uri = $uri->withScheme($scheme);
-        }
+        $uri = $uri->withScheme($scheme);
 
         // Set the host
         $accumulator = (object) ['host' => '', 'port' => null];