Merge remote-tracking branch 'upstream/master'

diff --combined lib/Geocode.php
index 3d6838b6d4045075fcf8f692c75547aff45be59e,bc81bced6918eb204f3ef9563cc39a9e5408bfcb..7ab53d97812a5cbf640672e93f0e963f8c6f10eb
--- 1/lib/Geocode.php
--- 2/lib/Geocode.php
+++ b/lib/Geocode.php
@@@ -18,7 -18,7 +18,7 @@@ class Geocod
      protected $aLangPrefOrder = array();
  
      protected $aExcludePlaceIDs = array();
 -    protected $bReverseInPlan = false;
 +    protected $bReverseInPlan = true;
  
      protected $iLimit = 20;
      protected $iFinalLimit = 10;
@@@ -642,12 -642,6 +642,6 @@@
              $oValidTokens = new TokenList();
  
              if (!empty($aTokens)) {
-                 $sSQL = 'SELECT word_id, word_token, word, class, type, country_code, operator, search_name_count';
-                 $sSQL .= ' FROM word ';
-                 $sSQL .= ' WHERE word_token in ('.join(',', $this->oDB->getDBQuotedList($aTokens)).')';
- 
-                 Debug::printSQL($sSQL);
- 
                  $oValidTokens->addTokensFromDB(
                      $this->oDB,
                      $aTokens,