Merge branch 'master' of https://github.com/google/google-api-php-client

Author: Ian Barber

src/Google/Http/Request.php

@@ -424,7 +424,9 @@ private function parseQuery($string)
       list($key, $value) = explode('=', $part, 2);
       $value = urldecode($value);
       if (isset($return[$key])) {
-        $return[$key] = array($return[$key]);
+        if (!is_array($return[$key])) {
+          $return[$key] = array($return[$key]);
+        }
         $return[$key][] = $value;
       } else {
         $return[$key] = $value;