Merge remote-tracking branch 'upstream/master'

diff --combined lib-php/Geocode.php
index 978ca679010ec5b9c6e5c166d2507ed3916865b4,ec1fa81da07fdae7b0891608d1fc66de1adfe40b..cd8b6edd860249f2007de47b763d36bcfe698a65
--- 1/lib-php/Geocode.php
--- 2/lib-php/Geocode.php
+++ b/lib-php/Geocode.php
@@@ -103,7 -103,7 +103,7 @@@ class Geocod
          }
  
          $this->iFinalLimit = $iLimit;
-         $this->iLimit = $iLimit + min($iLimit, 10);
+         $this->iLimit = $iLimit + max($iLimit, 10);
      }
  
      public function setFeatureType($sFeatureType)
@@@ -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;
                  }
              }