Merge remote-tracking branch 'upstream/master'

diff --combined lib-php/Geocode.php
index a12983b15acf331a87e9952c44d5273a1b25705e,acb79493734c6ece129e341b74d035f89743ac57..85d871f0d039f1b37072901f1ae09ae0650d9c64
--- 1/lib-php/Geocode.php
--- 2/lib-php/Geocode.php
+++ b/lib-php/Geocode.php
@@@ -695,7 -695,7 +695,7 @@@ class Geocod
                          }
                      }
  
 -                    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;
                  }
              }
@@@ -843,7 -843,9 +843,9 @@@
                  $aResult['importance'] = 0.001;
                  $aResult['foundorder'] = $aResult['addressimportance'];
              } else {
-                 $aResult['importance'] = max(0.001, $aResult['importance']);
+                 if ($aResult['importance'] == 0) {
+                     $aResult['importance'] = 0.0001;
+                 }
                  $aResult['importance'] *= $this->viewboxImportanceFactor(
                      $aResult['lon'],
                      $aResult['lat']