Merge remote-tracking branch 'upstream/master'

diff --combined lib/Geocode.php
index 598306235867e8afc7137241ef265f4353f321d9,f0e03de5f3e75c1b8e4b81ba458963c94b8828b9..1dd5a0e5ea3dd484d963d362959d2aafeae369c1
--- 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;
@@@ -149,6 -149,10 +149,10 @@@
  
      private function viewboxImportanceFactor($fX, $fY)
      {
+         if (!$this->aViewBox) {
+             return 1;
+         }
+ 
          $fWidth = ($this->aViewBox[2] - $this->aViewBox[0])/2;
          $fHeight = ($this->aViewBox[3] - $this->aViewBox[1])/2;