Merge remote-tracking branch 'upstream/master'

diff --combined lib-php/Geocode.php
index 85d871f0d039f1b37072901f1ae09ae0650d9c64,9e3b0b92fbc47638dd4ff4227a45b9617a9c2a6c..978ca679010ec5b9c6e5c166d2507ed3916865b4
--- 1/lib-php/Geocode.php
--- 2/lib-php/Geocode.php
+++ b/lib-php/Geocode.php
@@@ -190,7 -190,7 +190,7 @@@ class Geocod
  
          $this->bFallback = $oParams->getBool('fallback', $this->bFallback);
  
-         // List of excluded Place IDs - used for more acurate pageing
+         // List of excluded Place IDs - used for more accurate pageing
          $sExcluded = $oParams->getStringList('exclude_place_ids');
          if ($sExcluded) {
              foreach ($sExcluded as $iExcludedPlaceID) {
@@@ -695,7 -695,7 +695,7 @@@
                          }
                      }
  
 -                    if ($iQueryLoop > 20) {
 +                    if ($iQueryLoop > 30) {
                          break;
                      }
                  }
@@@ -772,7 -772,7 +772,7 @@@
                      $aResults = $tempIDs;
                  }
  
 -                if (!empty($aResults) || $iGroupLoop > 4 || $iQueryLoop > 30) {
 +                if (!empty($aResults) || $iGroupLoop > 6 || $iQueryLoop > 40) {
                      break;
                  }
              }