Merge remote-tracking branch 'upstream/master'

diff --combined lib-php/Geocode.php
index cd8b6edd860249f2007de47b763d36bcfe698a65,0881d20a216f5adeb77f22cf75dbc15cab0b4cc0..20edd9a5fe35485155011dadd591a5ea19b55a9f
--- 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;
                  }
              }
@@@ -874,7 -874,7 +874,7 @@@
                  $iCountWords = 0;
                  $sAddress = $aResult['langaddress'];
                  foreach ($aRecheckWords as $i => $sWord) {
-                     if (stripos($sAddress, $sWord)!==false) {
+                     if (grapheme_stripos($sAddress, $sWord)!==false) {
                          $iCountWords++;
                          if (preg_match('/(^|,)\s*'.preg_quote($sWord, '/').'\s*(,|$)/', $sAddress)) {
                              $iCountWords += 0.1;