Merge remote-tracking branch 'upstream/master'

diff --combined lib/Geocode.php
index 12410acc81a03373bdbd9e44d1dbee84daf13307,f45b2caae3349fa256a114dd61a501e0c2778bba..c1d0c46f80310fb76c9b2ca4c14a1111ee20f930
--- 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;
@@@ -907,12 -907,6 +907,6 @@@
                  $aResult = array_merge($aResult, $aOutlineResult);
              }
  
-             if ($aResult['extra_place'] == 'city') {
-                 $aResult['class'] = 'place';
-                 $aResult['type'] = 'city';
-                 $aResult['rank_search'] = 16;
-             }
- 
              // Is there an icon set for this type of result?
              $aClassInfo = ClassTypes\getInfo($aResult);